upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 03:42:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1812-uninitialized-dscp' into 'master'

Browse source 
Unexpected output from named-checkconf

Closes #1812

See merge request isc-projects/bind9!3502
This commit is contained in:
Evan Hunt 2020-05-06 19:40:16 +00:00
commit 287f615ae8
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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]

6
bin/tests/system/checkconf/good.conf
View file

@ -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";
};

1
bin/tests/system/checkconf/good.zonelist
View file

@ -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

2
bin/tests/system/checkconf/tests.sh
View file

@ -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" |

1
lib/isccfg/parser.c
View file

@ -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: