From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 17 Nov 2009 17:11:46 +0000 (+0000)
Subject: ITS#6372
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cfaceae80ff6a2d09e0d37f4d1ff9533696fc9ef;p=openldap

ITS#6372
---

diff --git a/CHANGES b/CHANGES
index 97413c43d0..054a1ea658 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,9 +8,10 @@ OpenLDAP 2.4.20 Engineering
 	Fixed libldap uninitialized return value (ITS#6355)
 	Fixed liblutil constant (ITS#5909)
 	Added slapd handling of hex server IDs (ITS#6297)
-	Fixed slapd inclusion of ac/unistd.h (ITS#6342)
 	Fixed slapd configArgs initialization (ITS#6363)
 	Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324)
+	Fixed slapd inclusion of ac/unistd.h (ITS#6342)
+	Fixed slapd lockup on shutdown (ITS#6372)
 	Fixed slapd termination for one level DNs (ITS#6338)
 	Fixed slapd unused parameter (ITS#6356)
 	Fixed slapd-bdb/hdb cache corruption (ITS#6341)
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b3cc805ec2..8027f2a788 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1620,6 +1620,7 @@ slapd_daemon_init( const char *urls )
 			"daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 );
 		return rc;
 	}
+	ber_pvt_socket_set_nonblock( wake_sds[1], 1 );
 
 	SLAP_SOCK_INIT;