From cf9d6b541f3674816000ab590b7afcfc5b11293f Mon Sep 17 00:00:00 2001 From: Curtis Blackburn Date: Wed, 28 Aug 2013 16:01:02 -0500 Subject: [PATCH] 3638. [cleanup] Add the ability to handle ENOPROTOOPT in case it is encountered. [RT #34668] --- CHANGES | 3 ++- lib/isc/unix/socket.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f30e08c9af..94daa52565 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 0e3e9cb429..9b1209f24c 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.