Compare commits

...

2 Commits

Author SHA1 Message Date
Mark Andrews
e3f91ffca0 9.6-ESV-R10-P1 2013-10-16 09:43:17 +11:00
Mark Andrews
b310d9f4ca 3656. [bug] Treat a all zero netmask as invalid when generating
the localnets acl. [RT #34687]

(cherry picked from commit c9ee72cb3a)
2013-10-15 10:40:09 +11:00
3 changed files with 17 additions and 5 deletions

View File

@@ -1,3 +1,8 @@
--- 9.6-ESV-R10-P1 released ---
3656. [bug] Treat a all zero netmask as invalid when generating
the localnets acl. [RT #34687]
--- 9.6-ESV-R10 released ---
3638. [cleanup] Add the ability to handle ENOPROTOOPT in case it is

View File

@@ -525,15 +525,22 @@ setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) {
return (result);
if (result != ISC_R_SUCCESS) {
isc_log_write(IFMGR_COMMON_LOGARGS,
ISC_LOG_WARNING,
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_WARNING,
"omitting IPv4 interface %s from "
"localnets ACL: %s",
interface->name,
"localnets ACL: %s", interface->name,
isc_result_totext(result));
return (ISC_R_SUCCESS);
}
if (prefixlen == 0U) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_WARNING,
"omitting %s interface %s from localnets ACL: "
"zero prefix length detected",
(netaddr->family == AF_INET) ? "IPv4" : "IPv6",
interface->name);
return (ISC_R_SUCCESS);
}
result = dns_iptable_addprefix(mgr->aclenv.localnets->iptable,
netaddr, prefixlen, ISC_TRUE);
if (result != ISC_R_SUCCESS)

View File

@@ -9,4 +9,4 @@ MAJORVER=9
MINORVER=6
PATCHVER=
RELEASETYPE=-ESV
RELEASEVER=-R10
RELEASEVER=-R10-P1