mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
ITS#6039 Winsock fixes
This commit is contained in:
parent
169ce0e5ea
commit
417b0b7013
@ -539,6 +539,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; \
|
||||||
@ -1670,7 +1671,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
|
||||||
|
Loading…
Reference in New Issue
Block a user