From: Curtis Blackburn <ckb@isc.org>
Date: Wed, 28 Aug 2013 21:01:02 +0000 (-0500)
Subject: 3638.   [cleanup]       Add the ability to handle ENOPROTOOPT in case it is
X-Git-Tag: v9.6-ESV-R10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf9d6b541f3674816000ab590b7afcfc5b11293f;p=thirdparty%2Fbind9.git

3638.   [cleanup]       Add the ability to handle ENOPROTOOPT in case it is
                        encountered. [RT #34668]
---

diff --git a/CHANGES b/CHANGES
index f30e08c9afe..94daa525656 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-	--- 9.6-ESV-R10rc2 released ---
+3638.	[cleanup]	Add the ability to handle ENOPROTOOPT in case it is 
+			encountered. [RT #34668]
 
 3637.	[bug]		'allow-query-on' was checking the source address
 			rather than the destination address. [RT #34590]
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 0e3e9cb4296..9b1209f24c2 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1529,6 +1529,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.