ITS#6372

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)

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;