From 95b8abe9329ffb2783bb2eabefab7c94c8b67334 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 21 Jan 2009 02:13:24 +0000
Subject: [PATCH] ITS#5855
---
CHANGES | 1 +
servers/slapd/daemon.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 4c10f31edb..5df24b5cb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ OpenLDAP 2.4.14 Engineering
Fixed slapd syncrepl rename handling (ITS#5809)
Fixed slapd syncrepl MMR when adding new server (ITS#5850)
Fixed slapd syncrepl replication with glued DB (ITS#5866)
+ Fixed slapd wake_sds close on Windows (ITS#5855)
Fixed slapd-bdb/hdb RFC4528 control support (ITS#5861)
Fixed slapd-ldap idassert-bind validity checking (ITS#5863)
Fixed slapd-ldif numerous bugs (ITS#5408)
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index f5555d6a18..fea9d35e23 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1646,7 +1646,7 @@ slapd_daemon_destroy( void )
{
connections_destroy();
#ifdef HAVE_WINSOCK
- if ( wake_sds[1] != INVALID_SOCKET )
+ if ( wake_sds[1] != INVALID_SOCKET && wake_sds[1] != wake_sds[0] )
#endif /* HAVE_WINSOCK */
tcp_close( SLAP_FD2SOCK(wake_sds[1]) );
#ifdef HAVE_WINSOCK
--
GitLab