Commit c7a2fe23 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5606

parent 6e62c293
OpenLDAP 2.4 Change Log
OpenLDAP 2.4.12 Engineering
Fixed slapd socket closing on Windows (ITS#5606)
Fixed slapd-meta quarantine behavior (ITS#5592)
Fixed slapo-constraint string termination (ITS#5609)
Fixed slapo-rwm callback cleanup (ITS#5601)
......
......@@ -79,7 +79,11 @@ Listener **slap_listeners = NULL;
#define SLAPD_LISTEN_BACKLOG 1024
#endif /* ! SLAPD_LISTEN_BACKLOG */
static ber_socket_t wake_sds[2];
static ber_socket_t wake_sds[2]
#ifdef HAVE_WINSOCK
= { INVALID_SOCKET, INVALID_SOCKET }
#endif /* HAVE_WINSOCK */
;
static int emfile;
static volatile int waking;
......@@ -1641,8 +1645,14 @@ int
slapd_daemon_destroy( void )
{
connections_destroy();
tcp_close( SLAP_FD2SOCK(wake_sds[1]) );
tcp_close( SLAP_FD2SOCK(wake_sds[0]) );
#ifdef HAVE_WINSOCK
if ( wake_sds[1] != INVALID_SOCKET )
#endif /* HAVE_WINSOCK */
tcp_close( SLAP_FD2SOCK(wake_sds[1]) );
#ifdef HAVE_WINSOCK
if ( wake_sds[0] != INVALID_SOCKET )
#endif /* HAVE_WINSOCK */
tcp_close( SLAP_FD2SOCK(wake_sds[0]) );
sockdestroy();
#ifdef HAVE_SLP
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment