[master] Corrects impossible condition error in the server

    Merges in rt36118.

diff --git a/RELNOTES b/RELNOTES
index 3b19034f7c3b55a7c1277032d4f020d5c755ea5f..95da5ace3007076c389693a1d93935f7d440fa96 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -305,6 +305,11 @@ dhcp-users@lists.isc.org.
   local-address6 destination.
   [ISC-Bugs #46084]
 
+- 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.3.6 (Bugs):
 
 - Corrected an issue where the server would return a client's previously

diff --git a/common/socket.c b/common/socket.c
index 9c42d45168d269cd28493ea848e239aa8c63b2a3..8879bc20ff2cc4b93f4ce2ad764ef47beb2f1afc 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -420,7 +420,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;