9.8.6-P1

the localnets acl. [RT #34687]

(cherry picked from commit c9ee72cb3a)

CHANGES

@@ -1,3 +1,13 @@
+	--- 9.8.6-P1 released ---
+
+3656.	[bug]		Treat a all zero netmask as invalid when generating
+			the localnets acl. [RT #34687]
+
+	--- 9.8.6 released ---
+
+3638.	[cleanup]	Add the ability to handle ENOPROTOOPT in case it is 
+			encountered. [RT #34668]
+
 	--- 9.8.6rc2 released ---
 
 3637.	[bug]		'allow-query-on' was checking the source address

bin/named/interfacemgr.c

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

bin/tests/system/acl/ns2/named5.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/acl/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

lib/isc/api

@@ -5,5 +5,5 @@
 # 9.9: 90-109
 # 9.9-sub: 130-139
 LIBINTERFACE = 89
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 5

lib/isc/unix/socket.c

@@ -1687,6 +1687,10 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) {
 		/* HPUX 11.11 can return EADDRNOTAVAIL. */
 		SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+		/* Should never get this one but it was seen. */
+#ifdef ENOPROTOOPT
+		SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
+#endif
 		/*
 		 * HPUX returns EPROTO and EINVAL on receiving some ICMP/ICMPv6
 		 * errors.

util/copyrights

@@ -524,8 +524,9 @@
 ./bin/tests/system/acl/ns2/named2.conf		CONF-C	2008
 ./bin/tests/system/acl/ns2/named3.conf		CONF-C	2008
 ./bin/tests/system/acl/ns2/named4.conf		CONF-C	2008
+./bin/tests/system/acl/ns2/named5.conf		CONF-C	2013
 ./bin/tests/system/acl/setup.sh			SH	2008,2012
-./bin/tests/system/acl/tests.sh			SH	2008,2012
+./bin/tests/system/acl/tests.sh			SH	2008,2012,2013
 ./bin/tests/system/additional/clean.sh		SH	2013
 ./bin/tests/system/additional/ns1/named.args	X	2013
 ./bin/tests/system/additional/ns1/named1.conf	CONF-C	2013

version

@@ -8,5 +8,5 @@ DESCRIPTION=
 MAJORVER=9
 MINORVER=8
 PATCHVER=6
-RELEASETYPE=rc
-RELEASEVER=2
+RELEASETYPE=-P
+RELEASEVER=1