From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 20 Jun 2019 14:18:14 +0000 (-0400)
Subject: [v4_1_esv] Corrects impossible condition error in the server
X-Git-Tag: v4_1_esv_r16b1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c72928ef6fe8541fb0fed4a1b998d83fdd227e5;p=thirdparty%2Fdhcp.git

[v4_1_esv] Corrects impossible condition error in the server

    Merges in rt36118.
---

diff --git a/RELNOTES b/RELNOTES
index fcade4c6c..2ad223fc0 100644
--- 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 3fe3d096c..882097175 100644
--- 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;