diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-06-20 10:18:14 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-06-20 10:18:14 -0400 |
| commit | 7c72928ef6fe8541fb0fed4a1b998d83fdd227e5 (patch) | |
| tree | dfca6a602e9d936385de624cf997f293b2bab8dc | |
| parent | 3024e99df64582ec34173724d302240d3fb9e7aa (diff) | |
| download | isc-dhcp-7c72928ef6fe8541fb0fed4a1b998d83fdd227e5.tar.gz | |
[v4_1_esv] Corrects impossible condition error in the server
Merges in rt36118.
| -rw-r--r-- | RELNOTES | 5 | ||||
| -rw-r--r-- | common/socket.c | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -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 3fe3d096..88209717 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; |