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

                        encountered. [RT #34668]

diff --git a/CHANGES b/CHANGES
index 5d76412d318e296a3f284ff5becf52bbbe26a0de..e227bdece1e1d506bc5e1e4edc63eca2f7231931 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-       --- 9.8.6rc2 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 d007598e19d095107f52ac479f56b7d792e587c9..e6cc3fff0fbac52d820062c752b3fe9cea02fc1f 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/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.