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

4359. [bug] Inherited 'also-notify' lists were not being checked

Browse source 
by named-checkconf. [RT #42174]

(cherry picked from commit 594d15df25)
This commit is contained in:
Mark Andrews 2016-05-05 21:59:09 +10:00
parent b412f689ed
commit a78ebc0302
6 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4359. [bug] Inherited 'also-notify' lists were not being checked
by named-checkconf. [RT #42174]
4354. [bug] Check that the received HMAC length matches the
expected length prior to check the contents on the
control channel. This prevents a OOB read error.

8
bin/tests/system/checkconf/bad-options-also-notify.conf Normal file
View file

@ -0,0 +1,8 @@
options {
also-notify { missing; };
};
zone "example.net" {
type slave;
masters { 192.168.1.1; };
};

7
bin/tests/system/checkconf/bad-view-also-notify.conf Normal file
View file

@ -0,0 +1,7 @@
view example {
also-notify { missing; };
zone "example.net" {
type slave;
masters { 192.168.1.1; };
};
};

9
bin/tests/system/checkconf/good-options-also-notify.conf Normal file
View file

@ -0,0 +1,9 @@
options {
also-notify { missing; };
};
zone "example.net" {
type slave;
notify no;
masters { 192.168.1.1; };
};

8
bin/tests/system/checkconf/good-view-also-notify.conf Normal file
View file

@ -0,0 +1,8 @@
view example {
also-notify { missing; };
zone "example.net" {
type slave;
notify no;
masters { 192.168.1.1; };
};
};

7
lib/bind9/check.c
View file

@ -1744,7 +1744,12 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
cfg_obj_log(zoptions, logctx, ISC_LOG_WARNING,
"zone '%s': 'also-notify' set but "
"'notify' is disabled", znamestr);
} else if (tresult == ISC_R_SUCCESS) {
}
if (tresult != ISC_R_SUCCESS && voptions != NULL)
tresult = cfg_map_get(voptions, "also-notify", &obj);
if (tresult != ISC_R_SUCCESS && goptions != NULL)
tresult = cfg_map_get(goptions, "also-notify", &obj);
if (tresult == ISC_R_SUCCESS && donotify) {
isc_uint32_t count;
tresult = validate_masters(obj, config, &count,
logctx, mctx);