mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

3753. [bug] allow-notify was ignoring keys. [RT #35425]

Browse Source
This commit is contained in:
Mark Andrews
2014-02-21 00:09:28 +11:00
parent 86856f4f30
commit edd82b2ce2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
3753. [bug] allow-notify was ignoring keys. [RT #35425]
3752. [bug] Address potential REQUIRE failure if 3752. [bug] Address potential REQUIRE failure if
DNS_STYLEFLAG_COMMENTDATA is set when printing out DNS_STYLEFLAG_COMMENTDATA is set when printing out
a rdataset. a rdataset.

6
lib/dns/zone.c
View File

@@ -12325,6 +12325,8 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
isc_sockaddr_t local, remote; isc_sockaddr_t local, remote;
isc_uint32_t serial = 0; isc_uint32_t serial = 0;
isc_boolean_t have_serial = ISC_FALSE; isc_boolean_t have_serial = ISC_FALSE;
dns_tsigkey_t *tsigkey;
dns_name_t *tsig;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
@@ -12410,8 +12412,10 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
* Accept notify requests from non masters if they are on * Accept notify requests from non masters if they are on
* 'zone->notify_acl'. * 'zone->notify_acl'.
*/ */
tsigkey = dns_message_gettsigkey(msg);
tsig = dns_tsigkey_identity(tsigkey);
if (i >= zone->masterscnt && zone->notify_acl != NULL && if (i >= zone->masterscnt && zone->notify_acl != NULL &&
dns_acl_match(&netaddr, NULL, zone->notify_acl, dns_acl_match(&netaddr, tsig, zone->notify_acl,
&zone->view->aclenv, &zone->view->aclenv,
&match, NULL) == ISC_R_SUCCESS && &match, NULL) == ISC_R_SUCCESS &&
match > 0) match > 0)