diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-12-20 06:29:06 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-12-20 06:29:06 -0500 |
| commit | 0e5c16614cd0afefe2cbd4e445aa830b581eeb98 (patch) | |
| tree | 7ecf2e9c8fdb4c1ef061abf42c2ba9760de2b4fe | |
| parent | ecf793da3bdfd169768538540c015fea7b30f7fe (diff) | |
| download | isc-dhcp-0e5c16614cd0afefe2cbd4e445aa830b581eeb98.tar.gz | |
[master] 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
@@ -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 9c42d451..8879bc20 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; |