3638. [cleanup] Add the ability to handle ENOPROTOOPT in case it is

                        encountered. [RT #34668]

diff --git a/CHANGES b/CHANGES
index f30e08c9afeeb10c76e3c5ea3ae1ad009c98bcce..94daa52565650a660923e9ce0d10f8f8169b441e 100644 (file)
--- 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 0e3e9cb4296d567d7d24abe587535d64cd9ec7f3..9b1209f24c2271c4e197035b9314c1986d5ae4d5 100644 (file)
--- 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.