From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 20 Dec 2017 11:29:06 +0000 (-0500)
Subject: [master] Corrects impossible condition error in the server
X-Git-Tag: v4_4_0b1_f1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e5c16614cd0afefe2cbd4e445aa830b581eeb98;p=thirdparty%2Fdhcp.git

[master] Corrects impossible condition error in the server

    Merges in rt36118.
---

diff --git a/RELNOTES b/RELNOTES
index 3b19034f7..95da5ace3 100644
--- 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 9c42d4516..8879bc20f 100644
--- 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;