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

ITS#6039

parent 5e5dd556
...@@ -6,6 +6,7 @@ OpenLDAP 2.4.17 Engineering ...@@ -6,6 +6,7 @@ OpenLDAP 2.4.17 Engineering
Fixed slapd global alloc handling (ITS#6054) Fixed slapd global alloc handling (ITS#6054)
Fixed slapd moduleload with static backends and modules (ITS#6016) Fixed slapd moduleload with static backends and modules (ITS#6016)
Fixed slapd normalization of updated schema attributes (ITS#5540) Fixed slapd normalization of updated schema attributes (ITS#5540)
Fixed slapd sockets usage on windows (ITS#6039)
Build Environment Build Environment
Added test056-monitor (ITS#5540) Added test056-monitor (ITS#5540)
Added test057-memberof-refint (ITS#5395) Added test057-memberof-refint (ITS#5395)
......
...@@ -537,6 +537,7 @@ static struct slap_daemon { ...@@ -537,6 +537,7 @@ static struct slap_daemon {
slap_daemon.sd_flags = (char *)(slapd_ws_sockets + dtblsize); \ slap_daemon.sd_flags = (char *)(slapd_ws_sockets + dtblsize); \
slap_daemon.sd_rflags = slap_daemon.sd_flags + dtblsize; \ slap_daemon.sd_rflags = slap_daemon.sd_flags + dtblsize; \
memset( slapd_ws_sockets, -1, dtblsize * sizeof(SOCKET) ); \ memset( slapd_ws_sockets, -1, dtblsize * sizeof(SOCKET) ); \
memset( slap_daemon.sd_flags, 0, dtblsize ); \
slapd_ws_sockets[0] = wake_sds[0]; \ slapd_ws_sockets[0] = wake_sds[0]; \
slapd_ws_sockets[1] = wake_sds[1]; \ slapd_ws_sockets[1] = wake_sds[1]; \
wake_sds[0] = 0; \ wake_sds[0] = 0; \
...@@ -1646,7 +1647,8 @@ slapd_daemon_destroy( void ) ...@@ -1646,7 +1647,8 @@ slapd_daemon_destroy( void )
{ {
connections_destroy(); connections_destroy();
#ifdef HAVE_WINSOCK #ifdef HAVE_WINSOCK
if ( wake_sds[1] != INVALID_SOCKET && wake_sds[1] != wake_sds[0] ) if ( wake_sds[1] != INVALID_SOCKET &&
SLAP_FD2SOCK( wake_sds[1] ) != SLAP_FD2SOCK( wake_sds[0] ))
#endif /* HAVE_WINSOCK */ #endif /* HAVE_WINSOCK */
tcp_close( SLAP_FD2SOCK(wake_sds[1]) ); tcp_close( SLAP_FD2SOCK(wake_sds[1]) );
#ifdef HAVE_WINSOCK #ifdef HAVE_WINSOCK
......
Supports Markdown
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