diff --git a/CHANGES b/CHANGES index 75529d89ec..337903517d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5405. [bug] 'named-checkconf -p' could include spurious text + in server-addresses statements due to an uninitialized + DSCP value. [GL #1812] + 5404. [bug] 'named-checkconf -z' could incorrectly indicate success if errors were found in one view but not in a subsequent one. [GL #1807] diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index f2dae97362..2faeadbebc 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -120,6 +120,12 @@ view "second" { }; zone-statistics no; }; + zone "example3" { + type static-stub; + server-addresses { + 1.2.3.4; + }; + }; zone "clone" { in-view "first"; }; diff --git a/bin/tests/system/checkconf/good.zonelist b/bin/tests/system/checkconf/good.zonelist index dff4d170ca..b33d2fc239 100644 --- a/bin/tests/system/checkconf/good.zonelist +++ b/bin/tests/system/checkconf/good.zonelist @@ -2,6 +2,7 @@ example1 IN first master clone IN first master example1 IN second master example2 IN second static-stub +example3 IN second static-stub clone IN second in-view first . IN second redirect clone IN third in-view first diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index a3901111fa..b2f5b7b22f 100644 --- a/bin/tests/system/checkconf/tests.sh +++ b/bin/tests/system/checkconf/tests.sh @@ -380,7 +380,7 @@ if [ $ret != 0 ]; then echo_i "failed"; ret=1; fi status=`expr $status + $ret` n=`expr $n + 1` -echo_i "check that named-checkconf -l print out the zone list ($n)" +echo_i "check that named-checkconf -l prints out the zone list ($n)" ret=0 $CHECKCONF -l good.conf | grep -v "is not implemented" | diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 154311ace4..73ade898a0 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -3239,6 +3239,7 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, 0); + obj->value.sockaddrdscp.dscp = -1; *ret = obj; return (ISC_R_SUCCESS); cleanup: