[v4_1_esv] Corrects impossible condition error in the server

    Merges in rt36118.

diff --git a/RELNOTES b/RELNOTES
index fcade4c6c1f6018ddfd942f475c4f335fbf97e23..2ad223fc0b1edf21a84f75640f2f5ca64482b250 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -100,6 +100,11 @@ dhcp-users@lists.isc.org.
   to Fernando Soto at Bluecat for bringing this matter to our attention.
   [ISC-Bugs #46859]
 
+- Removed an "Impossible condition" error upon exit in the dhcpd server that
+  has been shutdown via OMAPI. This condition was only apparent under Solaris
+  when building with --enable-use-sockets and --enable-ipv4-pktinfo.
+  [ISC-Bugs #36118]
+
                        Changes since 4.1-ESV-R15b1
 
 - None

diff --git a/common/socket.c b/common/socket.c
index 3fe3d096c21fb6d061625b09dea10fc6371380bb..8820971754672ffe4f4bad8cbe402e36c2837443 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -404,7 +404,6 @@ void if_deregister_receive (info)
 #if defined(IP_PKTINFO) && defined(IP_RECVPKTINFO) && defined(USE_V4_PKTINFO)
        /* Dereference the global v4 socket. */
        if ((info->rfdesc == global_v4_socket) &&
-           (info->wfdesc == global_v4_socket) &&
            (global_v4_socket_references > 0)) {
                global_v4_socket_references--;
                info->rfdesc = -1;