X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=e8bab2673664b792cd065a3fca1f41676604fb0e;hb=e4b899df95374d56f79350a146fea649db3b2a57;hp=c34077e2244ef3013edcccaefe026d1240bf3c7b;hpb=27fdd04153e886a882fe773c7f1bc1503ae0c132;p=openldap

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index c34077e224..e8bab26736 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1,7 +1,26 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -20,12 +39,17 @@
 #include "lutil.h"
 #include "slap.h"
 
+#include "ldap_rq.h"
+
 #ifdef HAVE_TCPD
 #include <tcpd.h>
+#define SLAP_STRING_UNKNOWN	STRING_UNKNOWN
 
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_NOTICE;
-#endif /* TCP Wrappers */
+#else /* ! TCP Wrappers */
+#define SLAP_STRING_UNKNOWN	"unknown"
+#endif /* ! TCP Wrappers */
 
 #ifdef LDAP_PF_LOCAL
 #include <sys/stat.h>
@@ -33,7 +57,11 @@ int deny_severity = LOG_NOTICE;
 #define LDAPI_MOD_URLEXT		"x-mod"
 #endif /* LDAP_PF_LOCAL */
 
+#ifdef LDAP_PF_INET6
 int slap_inet4or6 = AF_UNSPEC;
+#else
+int slap_inet4or6 = AF_INET;
+#endif
 
 /* globals */
 time_t starttime;
@@ -44,8 +72,9 @@ Listener **slap_listeners = NULL;
 #define SLAPD_LISTEN 10
 
 static ber_socket_t wake_sds[2];
+static int emfile;
 
-#ifdef NO_THREADS
+#if defined(NO_THREADS) || defined(HAVE_GNU_PTH)
 static int waking;
 #define WAKE_LISTENER(w) \
 ((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0)
@@ -58,6 +87,7 @@ do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
 static
 #endif
 volatile sig_atomic_t slapd_shutdown = 0, slapd_gentle_shutdown = 0;
+volatile sig_atomic_t slapd_abrupt_shutdown = 0;
 
 static struct slap_daemon {
 	ldap_pvt_thread_mutex_t	sd_mutex;
@@ -91,7 +121,7 @@ static SLPHandle slapd_hslp = 0;
 void slapd_slp_init( const char* urls ) {
 	int i;
 
-	slapd_srvurls = str2charray( urls, " " );
+	slapd_srvurls = ldap_str2charray( urls, " " );
 
 	if( slapd_srvurls == NULL ) return;
 
@@ -100,10 +130,10 @@ void slapd_slp_init( const char* urls ) {
 		if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) {
 			char *host = ldap_pvt_get_fqdn( NULL );
 			if ( host != NULL ) {
-				slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+				slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
 					strlen( host ) +
 					sizeof( LDAP_SRVTYPE_PREFIX ) );
-				strcpy( slap_strcopy(slapd_srvurls[i],
+				strcpy( lutil_strcopy(slapd_srvurls[i],
 					LDAP_SRVTYPE_PREFIX ), host );
 
 				ch_free( host );
@@ -112,10 +142,10 @@ void slapd_slp_init( const char* urls ) {
 		} else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) {
 			char *host = ldap_pvt_get_fqdn( NULL );
 			if ( host != NULL ) {
-				slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+				slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
 					strlen( host ) +
 					sizeof( LDAPS_SRVTYPE_PREFIX ) );
-				strcpy( slap_strcopy(slapd_srvurls[i],
+				strcpy( lutil_strcopy(slapd_srvurls[i],
 					LDAPS_SRVTYPE_PREFIX ), host );
 
 				ch_free( host );
@@ -130,7 +160,7 @@ void slapd_slp_init( const char* urls ) {
 void slapd_slp_deinit() {
 	if( slapd_srvurls == NULL ) return;
 
-	charray_free( slapd_srvurls );
+	ldap_charray_free( slapd_srvurls );
 	slapd_srvurls = NULL;
 
 	/* close the SLP handle */
@@ -148,6 +178,8 @@ void slapd_slp_regreport(
 void slapd_slp_reg() {
 	int i;
 
+	if( slapd_srvurls == NULL ) return;
+
 	for( i=0; slapd_srvurls[i] != NULL; i++ ) {
 		if( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX,
 				sizeof( LDAP_SRVTYPE_PREFIX ) - 1 ) == 0 ||
@@ -169,6 +201,8 @@ void slapd_slp_reg() {
 void slapd_slp_dereg() {
 	int i;
 
+	if( slapd_srvurls == NULL ) return;
+
 	for( i=0; slapd_srvurls[i] != NULL; i++ ) {
 		SLPDereg( slapd_hslp,
 			slapd_srvurls[i],
@@ -180,8 +214,13 @@ void slapd_slp_dereg() {
 
 /*
  * Add a descriptor to daemon control
+ *
+ * If isactive, the descriptor is a live server session and is subject
+ * to idletimeout control. Otherwise, the descriptor is a passive
+ * listener or an outbound client session, and not subject to
+ * idletimeout.
  */
-static void slapd_add(ber_socket_t s) {
+static void slapd_add(ber_socket_t s, int isactive) {
 	ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
 	assert( !FD_ISSET( s, &slap_daemon.sd_actives ));
@@ -194,17 +233,18 @@ static void slapd_add(ber_socket_t s) {
 	}
 #endif
 
-	slap_daemon.sd_nactives++;
+	if ( isactive ) {
+		slap_daemon.sd_nactives++;
+	}
 
 	FD_SET( s, &slap_daemon.sd_actives );
 	FD_SET( s, &slap_daemon.sd_readers );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-		   "slapd_add: added %ld%s%s\n",
-		   (long)s,
-		   FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
-		   FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ));
+	LDAP_LOG( CONNECTION, DETAIL1, 
+		"slapd_add: added %ld%s%s\n", (long)s,
+		FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
+		FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" );
 #else
 	Debug( LDAP_DEBUG_CONNS, "daemon: added %ld%s%s\n",
 		(long) s,
@@ -217,17 +257,18 @@ static void slapd_add(ber_socket_t s) {
 /*
  * Remove the descriptor from daemon control
  */
-void slapd_remove(ber_socket_t s, int wake) {
+void slapd_remove(ber_socket_t s, int wasactive, int wake) {
 	ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
-	slap_daemon.sd_nactives--;
+	if ( wasactive ) {
+		slap_daemon.sd_nactives--;
+	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-		   "slapd_remove: removing %ld%s%s\n",
-		   (long) s,
-		   FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
-		   FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : ""  ));
+	LDAP_LOG( CONNECTION, DETAIL1, 
+		"slapd_remove: removing %ld%s%s\n", (long) s,
+		FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
+		FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : ""  );
 #else
 	Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n",
 		(long) s,
@@ -238,6 +279,28 @@ void slapd_remove(ber_socket_t s, int wake) {
 	FD_CLR( s, &slap_daemon.sd_readers );
 	FD_CLR( s, &slap_daemon.sd_writers );
 
+	/* If we ran out of file descriptors, we dropped a listener from
+	 * the select() loop. Now that we're removing a session from our
+	 * control, we can try to resume a dropped listener to use.
+	 */
+	if ( emfile ) {
+		int i;
+		for ( i = 0; slap_listeners[i] != NULL; i++ ) {
+			if ( slap_listeners[i]->sl_sd != AC_SOCKET_INVALID ) {
+				if ( slap_listeners[i]->sl_sd == s ) continue;
+				if ( slap_listeners[i]->sl_is_mute ) {
+					slap_listeners[i]->sl_is_mute = 0;
+					emfile--;
+					break;
+				}
+			}
+		}
+		/* Walked the entire list without enabling anything; emfile
+		 * counter is stale. Reset it.
+		 */
+		if ( slap_listeners[i] == NULL )
+			emfile = 0;
+	}
 	ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 	WAKE_LISTENER(wake || slapd_gentle_shutdown == 2);
 }
@@ -286,8 +349,7 @@ void slapd_set_read(ber_socket_t s, int wake) {
 
 static void slapd_close(ber_socket_t s) {
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-		   "slapd_close: closing %ld\n", (long)s ));
+	LDAP_LOG( CONNECTION, DETAIL1, "slapd_close: closing %ld\n", (long)s, 0, 0);
 #else
 	Debug( LDAP_DEBUG_CONNS, "daemon: closing %ld\n",
 		(long) s, 0, 0 );
@@ -310,7 +372,7 @@ static void slap_free_listener_addresses(struct sockaddr **sal)
 	ch_free(sal);
 }
 
-#ifdef LDAP_PF_LOCAL
+#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD)
 static int get_url_perms(
 	char 	**exts,
 	mode_t	*perms,
@@ -333,27 +395,53 @@ static int get_url_perms(
 		}
 
 		if ( strncasecmp( type, LDAPI_MOD_URLEXT "=", sizeof(LDAPI_MOD_URLEXT "=") - 1 ) == 0 ) {
-			char 	*value = type + sizeof(LDAPI_MOD_URLEXT "=") - 1;
+			char 	*value = type
+				+ ( sizeof(LDAPI_MOD_URLEXT "=") - 1 );
 			mode_t	p = 0;
 			int 	j;
 
-			if ( strlen(value) != 3 ) {
-				return LDAP_OTHER;
-			} 
+			switch (strlen(value)) {
+			case 4:
+				/* skip leading '0' */
+				if ( value[ 0 ] != '0' ) {
+					return LDAP_OTHER;
+				}
+				value++;
 
-			for ( j = 0; j < 3; j++ ) {
-				static mode_t	m[ 3 ] 
-					= { S_IRWXU, S_IRWXG, S_IRWXO };
+			case 3:
+				for ( j = 0; j < 3; j++) {
+					int	v;
 
-				switch ( value[ j ] ) {
-				case 'w':
-					p |= m[ j ];
-					break;
-				case '-':
-					break;
-				default:
-					return LDAP_OTHER;
+					v = value[ j ] - '0';
+
+					if ( v < 0 || v > 7 ) {
+						return LDAP_OTHER;
+					}
+
+					p |= v << 3*(2-j);
 				}
+				break;
+
+			case 10:
+				for ( j = 1; j < 10; j++ ) {
+					static mode_t	m[] = { 0, 
+						S_IRUSR, S_IWUSR, S_IXUSR,
+						S_IRGRP, S_IWGRP, S_IXGRP,
+						S_IROTH, S_IWOTH, S_IXOTH
+					};
+					static char	c[] = "-rwxrwxrwx"; 
+
+					if ( value[ j ] == c[ j ] ) {
+						p |= m[ j ];
+	
+					} else if ( value[ j ] != '-' ) {
+						return LDAP_OTHER;
+					}
+				}
+				break;
+
+			default:
+				return LDAP_OTHER;
 			} 
 
 			*crit = c;
@@ -365,7 +453,7 @@ static int get_url_perms(
 
 	return LDAP_OTHER;
 }
-#endif /* LDAP_PF_LOCAL */
+#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */
 
 /* port = 0 indicates AF_LOCAL */
 static int slap_get_listener_addresses(
@@ -391,9 +479,9 @@ static int slap_get_listener_addresses(
 		if ( strlen(host) >
 		     (sizeof(((struct sockaddr_un *)*sap)->sun_path) - 1) ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-				   "slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
-				   host ));
+			LDAP_LOG( CONNECTION, INFO, 
+				"slap_get_listener_addresses: domain socket path (%s) "
+				"too long in URL\n", host, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY,
 			       "daemon: domain socket path (%s) too long in URL",
@@ -421,9 +509,9 @@ static int slap_get_listener_addresses(
 
 		if ( (err = getaddrinfo(host, serv, &hints, &res)) ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+			LDAP_LOG( CONNECTION, INFO, 
 				   "slap_get_listener_addresses: getaddrinfo failed: %s\n",
-				   AC_GAI_STRERROR(err) ));
+				   AC_GAI_STRERROR(err), 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
 				AC_GAI_STRERROR(err), 0, 0);
@@ -446,9 +534,9 @@ static int slap_get_listener_addresses(
 		for ( sai=res; sai; sai=sai->ai_next ) {
 			if( sai->ai_addr == NULL ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+				LDAP_LOG( CONNECTION, INFO,
 					"slap_get_listener_addresses: "
-					"getaddrinfo ai_addr is NULL?\n" ));
+					"getaddrinfo ai_addr is NULL?\n", 0, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: "
 					"getaddrinfo ai_addr is NULL?\n", 0, 0, 0 );
@@ -503,9 +591,8 @@ static int slap_get_listener_addresses(
 			he = gethostbyname( host );
 			if( he == NULL ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-					   "slap_get_listener_addresses: invalid host %s\n",
-					   host ));
+				LDAP_LOG( CONNECTION, INFO, 
+					"slap_get_listener_addresses: invalid host %s\n", host, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
 				       "daemon: invalid host %s", host, 0, 0);
@@ -560,18 +647,21 @@ static int slap_open_listener(
 	int err, addrlen = 0;
 	struct sockaddr **sal, **psal;
 	int socktype = SOCK_STREAM;	/* default to COTS */
-#ifdef LDAP_PF_LOCAL
-	mode_t 	perms = S_IRWXU;
+
+#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD)
+	/*
+	 * use safe defaults
+	 */
 	int	crit = 1;
-#endif
+#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */
 
 	rc = ldap_url_parse( url, &lud );
 
 	if( rc != LDAP_URL_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-			   "slap_open_listener: listen URL \"%s\" parse error %d\n",
-			   url, rc ));
+		LDAP_LOG( CONNECTION, ERR, 
+			"slap_open_listener: listen URL \"%s\" parse error %d\n",
+			url, rc , 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"daemon: listen URL \"%s\" parse error=%d\n",
@@ -580,12 +670,14 @@ static int slap_open_listener(
 		return rc;
 	}
 
+	l.sl_url.bv_val = NULL;
+	l.sl_is_mute = 0;
+
 #ifndef HAVE_TLS
 	if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-			   "slap_open_listener: TLS is not supported (%s)\n",
-			   url ));
+		LDAP_LOG( CONNECTION, INFO, 
+			   "slap_open_listener: TLS is not supported (%s)\n", url, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"daemon: TLS not supported (%s)\n",
@@ -617,16 +709,11 @@ static int slap_open_listener(
 		} else {
 			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
 		}
-
-		if ( lud->lud_exts ) {
-			err = get_url_perms( lud->lud_exts, &perms, &crit );
-		}
 #else
 
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-			   "slap_open_listener: URL scheme is not supported: %s\n",
-			   url ));
+		LDAP_LOG( CONNECTION, INFO, 
+			"slap_open_listener: URL scheme is not supported: %s\n", url, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
 			url, 0, 0);
@@ -635,9 +722,6 @@ static int slap_open_listener(
 		return -1;
 #endif
 	} else {
-#ifdef LDAP_CONNECTIONLESS
-		l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
-#endif
 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
 			|| strcmp(lud->lud_host, "*") == 0 )
 		{
@@ -646,6 +730,17 @@ static int slap_open_listener(
 			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
 		}
 	}
+#ifdef LDAP_CONNECTIONLESS
+	l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
+#endif
+
+#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD)
+	if ( lud->lud_exts ) {
+		err = get_url_perms( lud->lud_exts, &l.sl_perms, &crit );
+	} else {
+		l.sl_perms = S_IRWXU | S_IRWXO;
+	}
+#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */
 
 	ldap_free_urldesc( lud );
 	if ( err ) {
@@ -663,34 +758,39 @@ static int slap_open_listener(
 
 	psal = sal;
 	while ( *sal != NULL ) {
+		char *af;
 		switch( (*sal)->sa_family ) {
 		case AF_INET:
+			af = "IPv4";
+			break;
 #ifdef LDAP_PF_INET6
 		case AF_INET6:
+			af = "IPv6";
+			break;
 #endif
 #ifdef LDAP_PF_LOCAL
 		case AF_LOCAL:
-#endif
+			af = "Local";
 			break;
+#endif
 		default:
 			sal++;
 			continue;
 		}
 #ifdef LDAP_CONNECTIONLESS
-		if (l.sl_is_udp)
-		    socktype = SOCK_DGRAM;
+		if( l.sl_is_udp ) socktype = SOCK_DGRAM;
 #endif
 		l.sl_sd = socket( (*sal)->sa_family, socktype, 0);
 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
 			int err = sock_errno();
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-				   "slap_open_listener: socket() failed errno=%d (%s)\n",
-				   err, sock_errstr(err) ));
+			LDAP_LOG( CONNECTION, ERR, 
+				"slap_open_listener: %s socket() failed errno=%d (%s)\n",
+				af, err, sock_errstr(err) );
 #else
 			Debug( LDAP_DEBUG_ANY,
-				"daemon: socket() failed errno=%d (%s)\n", err,
-				sock_errstr(err), 0 );
+				"daemon: %s socket() failed errno=%d (%s)\n",
+				af, err, sock_errstr(err) );
 #endif
 			sal++;
 			continue;
@@ -698,13 +798,13 @@ static int slap_open_listener(
 #ifndef HAVE_WINSOCK
 		if ( l.sl_sd >= dtblsize ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-				   "slap_open_listener: listener descriptor %ld is too great %ld\n",
-				   (long)l.sl_sd, (long)dtblsize ));
+			LDAP_LOG( CONNECTION, ERR, 
+				"slap_open_listener: listener descriptor %ld is too "
+				"great %ld\n", (long)l.sl_sd, (long)dtblsize, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY,
-			       "daemon: listener descriptor %ld is too great %ld\n",
-			       (long) l.sl_sd, (long) dtblsize, 0 );
+				"daemon: listener descriptor %ld is too great %ld\n",
+				(long) l.sl_sd, (long) dtblsize, 0 );
 #endif
 			tcp_close( l.sl_sd );
 			sal++;
@@ -721,13 +821,14 @@ static int slap_open_listener(
 			/* enable address reuse */
 			tmp = 1;
 			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-					 (char *) &tmp, sizeof(tmp) );
+				(char *) &tmp, sizeof(tmp) );
 			if ( rc == AC_SOCKET_ERROR ) {
 				int err = sock_errno();
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-					   "slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) failed errno %d (%s)\n",
-					   (long)l.sl_sd, err, sock_errstr(err) ));
+				LDAP_LOG( CONNECTION, INFO, 
+					"slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) "
+					"failed errno %d (%s)\n", (long)l.sl_sd, err, 
+					sock_errstr(err) );
 #else
 				Debug( LDAP_DEBUG_ANY,
 				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
@@ -743,6 +844,24 @@ static int slap_open_listener(
 			break;
 #ifdef LDAP_PF_INET6
 		case AF_INET6:
+#ifdef IPV6_V6ONLY
+			/* Try to use IPv6 sockets for IPv6 only */
+			tmp = 1;
+			rc = setsockopt( l.sl_sd, IPPROTO_IPV6, IPV6_V6ONLY,
+					 (char *) &tmp, sizeof(tmp) );
+			if ( rc == AC_SOCKET_ERROR ) {
+				int err = sock_errno();
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONNECTION, INFO,
+					   "slap_open_listener: setsockopt( %ld, IPV6_V6ONLY ) failed errno %d (%s)\n",
+					   (long)l.sl_sd, err, sock_errstr(err) );
+#else
+				Debug( LDAP_DEBUG_ANY,
+				       "slapd(%ld): setsockopt(IPV6_V6ONLY) failed errno=%d (%s)\n",
+				       (long) l.sl_sd, err, sock_errstr(err) );
+#endif
+			}
+#endif
 			addrlen = sizeof(struct sockaddr_in6);
 			break;
 #endif
@@ -756,9 +875,9 @@ static int slap_open_listener(
 		if (bind(l.sl_sd, *sal, addrlen)) {
 			err = sock_errno();
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-			   "slap_open_listener: bind(%ld) failed errno=%d (%s)\n",
-			   (long)l.sl_sd, err, sock_errstr(err) ));
+		LDAP_LOG( CONNECTION, INFO, 
+			"slap_open_listener: bind(%ld) failed errno=%d (%s)\n",
+			(long)l.sl_sd, err, sock_errstr(err) );
 #else
 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
 		       (long) l.sl_sd, err, sock_errstr(err) );
@@ -772,12 +891,13 @@ static int slap_open_listener(
 #ifdef LDAP_PF_LOCAL
 	case AF_LOCAL: {
 		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-		if ( chmod( addr, perms ) < 0 && crit ) {
+#if 0 /* don't muck with socket perms */
+		if ( chmod( addr, l.sl_perms ) < 0 && crit ) {
 			int err = sock_errno();
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-				   "slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n",
-				   (long)l.sl_sd, err, sock_errstr(err) ));
+			LDAP_LOG( CONNECTION, INFO, 
+				"slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n",
+				(long)l.sl_sd, err, sock_errstr(err) );
 #else
 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
 			       (long) l.sl_sd, err, sock_errstr(err) );
@@ -786,8 +906,11 @@ static int slap_open_listener(
 			slap_free_listener_addresses(psal);
 			return -1;
 		}
-		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-		sprintf( l.sl_name, "PATH=%s", addr );
+#endif
+		l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1;
+		l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 );
+		snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, 
+				"PATH=%s", addr );
 	} break;
 #endif /* LDAP_PF_LOCAL */
 
@@ -802,9 +925,11 @@ static int slap_open_listener(
 		s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr );
 #endif
 		port = ntohs( ((struct sockaddr_in *)*sal) ->sin_port );
-		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-		sprintf( l.sl_name, "IP=%s:%d",
-			 s != NULL ? s : "unknown" , port );
+		l.sl_name.bv_val = ber_memalloc( sizeof("IP=255.255.255.255:65535") );
+		snprintf( l.sl_name.bv_val, sizeof("IP=255.255.255.255:65535"),
+			"IP=%s:%d",
+			 s != NULL ? s : SLAP_STRING_UNKNOWN, port );
+		l.sl_name.bv_len = strlen( l.sl_name.bv_val );
 	} break;
 
 #ifdef LDAP_PF_INET6
@@ -813,16 +938,19 @@ static int slap_open_listener(
 		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
 			   addr, sizeof addr);
 		port = ntohs( ((struct sockaddr_in6 *)*sal)->sin6_port );
-		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-		sprintf( l.sl_name, "IP=%s %d", addr, port );
+		l.sl_name.bv_len = strlen(addr) + sizeof("IP= 65535");
+		l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len );
+		snprintf( l.sl_name.bv_val, l.sl_name.bv_len, "IP=%s %d", 
+				addr, port );
+		l.sl_name.bv_len = strlen( l.sl_name.bv_val );
 	} break;
 #endif /* LDAP_PF_INET6 */
 
 	default:
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-			   "slap_open_listener: unsupported address family (%d)\n",
-			   (int)(*sal)->sa_family ));
+		LDAP_LOG( CONNECTION, INFO, 
+			"slap_open_listener: unsupported address family (%d)\n",
+			(int)(*sal)->sa_family, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
 			(int) (*sal)->sa_family, 0, 0 );
@@ -831,7 +959,7 @@ static int slap_open_listener(
 	}
 
 	AC_MEMCPY(&l.sl_sa, *sal, addrlen);
-	l.sl_url = ch_strdup( url );
+	ber_str2bv( url, 0, 1, &l.sl_url);
 	li = ch_malloc( sizeof( Listener ) );
 	*li = l;
 	slap_listeners[*cur] = li;
@@ -842,13 +970,25 @@ static int slap_open_listener(
 
 	slap_free_listener_addresses(psal);
 
+	if ( l.sl_url.bv_val == NULL )
+	{
+#ifdef NEW_LOGGING
+		LDAP_LOG( CONNECTION, RESULTS, 
+			"slap_open_listener: failed on %s\n", url, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"slap_open_listener: failed on %s\n", url, 0, 0 );
+#endif
+		return -1;
+	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
-		   "slap_open_listener: daemon initialized %s\n", l.sl_url ));
+	LDAP_LOG( CONNECTION, RESULTS, 
+		"slap_open_listener: daemon initialized %s\n",
+		l.sl_url.bv_val, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n",
-		l.sl_url, 0, 0 );
+		l.sl_url.bv_val, 0, 0 );
 #endif
 	return 0;
 }
@@ -862,9 +1002,8 @@ int slapd_daemon_init( const char *urls )
 	char **u;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
-		   "slapd_daemon_init: %s\n",
-		   urls ? urls : "<null>" ));
+	LDAP_LOG( CONNECTION, ARGS, 
+		"slapd_daemon_init: %s\n", urls ? urls : "<null>", 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
 		urls ? urls : "<null>", 0, 0 );
@@ -894,8 +1033,8 @@ int slapd_daemon_init( const char *urls )
 	 */
 	if( (rc = lutil_pair( wake_sds )) < 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-			   "slap_daemon_init: lutil_pair() failed rc=%d\n", rc ));
+		LDAP_LOG( CONNECTION, ERR, 
+			"slap_daemon_init: lutil_pair() failed rc=%d\n", rc, 0, 0);
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 );
@@ -910,12 +1049,12 @@ int slapd_daemon_init( const char *urls )
 		urls = "ldap:///";
 	}
 
-	u = str2charray( urls, " " );
+	u = ldap_str2charray( urls, " " );
 
 	if( u == NULL || u[0] == NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-			   "slap_daemon_init: no urls (%s) provided.\n", urls ));
+		LDAP_LOG( CONNECTION, ERR, 
+			"slap_daemon_init: no urls (%s) provided.\n", urls, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n",
 			urls, 0, 0 );
@@ -925,8 +1064,8 @@ int slapd_daemon_init( const char *urls )
 
 	for( i=0; u[i] != NULL; i++ ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-			   "slap_daemon_init: listen on %s\n.", u[i] ));
+		LDAP_LOG( CONNECTION, DETAIL1, 
+			"slap_daemon_init: listen on %s\n", u[i], 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "daemon_init: listen on %s\n",
 			u[i], 0, 0 );
@@ -935,19 +1074,19 @@ int slapd_daemon_init( const char *urls )
 
 	if( i == 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-			   "slap_daemon_init: no listeners to open (%s)\n", urls ));
+		LDAP_LOG( CONNECTION, INFO, 
+			 "slap_daemon_init: no listeners to open (%s)\n", urls, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "daemon_init: no listeners to open (%s)\n",
 			urls, 0, 0 );
 #endif
-		charray_free( u );
+		ldap_charray_free( u );
 		return -1;
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-		   "slap_daemon_init: %d listeners to open...\n", i ));
+	LDAP_LOG( CONNECTION, INFO, 
+		"slap_daemon_init: %d listeners to open...\n", i, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners to open...\n",
 		i, 0, 0 );
@@ -956,15 +1095,15 @@ int slapd_daemon_init( const char *urls )
 
 	for(n = 0, j = 0; u[n]; n++ ) {
 		if ( slap_open_listener( u[n], &i, &j ) ) {
-			charray_free( u );
+			ldap_charray_free( u );
 			return -1;
 		}
 	}
 	slap_listeners[j] = NULL;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-		   "slap_daemon_init: %d listeners opened\n", i ));
+	LDAP_LOG( CONNECTION, DETAIL1, 
+		"slap_daemon_init: %d listeners opened\n", i, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners opened\n",
 		i, 0, 0 );
@@ -975,7 +1114,7 @@ int slapd_daemon_init( const char *urls )
 	slapd_slp_reg();
 #endif
 
-	charray_free( u );
+	ldap_charray_free( u );
 	ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex );
 	return !i;
 }
@@ -1006,9 +1145,9 @@ close_listeners(
 	int l;
 
 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-		if ( remove )
-			slapd_remove( slap_listeners[l]->sl_sd, 0 );
 		if ( slap_listeners[l]->sl_sd != AC_SOCKET_INVALID ) {
+			if ( remove )
+				slapd_remove( slap_listeners[l]->sl_sd, 0, 0 );
 #ifdef LDAP_PF_LOCAL
 			if ( slap_listeners[l]->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
 				unlink( slap_listeners[l]->sl_sa.sa_un_addr.sun_path );
@@ -1016,10 +1155,10 @@ close_listeners(
 #endif /* LDAP_PF_LOCAL */
 			slapd_close( slap_listeners[l]->sl_sd );
 		}
-		if ( slap_listeners[l]->sl_url )
-			free ( slap_listeners[l]->sl_url );
-		if ( slap_listeners[l]->sl_name )
-			free ( slap_listeners[l]->sl_name );
+		if ( slap_listeners[l]->sl_url.bv_val )
+			ber_memfree( slap_listeners[l]->sl_url.bv_val );
+		if ( slap_listeners[l]->sl_name.bv_val )
+			ber_memfree( slap_listeners[l]->sl_name.bv_val );
 		free ( slap_listeners[l] );
 		slap_listeners[l] = NULL;
 	}
@@ -1033,11 +1172,24 @@ slapd_daemon_task(
 {
 	int l;
 	time_t	last_idle_check = 0;
-	time( &starttime );
+	struct timeval idle;
+
+#define SLAPD_IDLE_CHECK_LIMIT 4
 
 	if ( global_idletimeout > 0 ) {
 		last_idle_check = slap_get_time();
+		/* Set the select timeout.
+		 * Don't just truncate, preserve the fractions of
+		 * seconds to prevent sleeping for zero time.
+		 */
+		idle.tv_sec = global_idletimeout/SLAPD_IDLE_CHECK_LIMIT;
+		idle.tv_usec = global_idletimeout - idle.tv_sec * SLAPD_IDLE_CHECK_LIMIT;
+		idle.tv_usec *= 1000000 / SLAPD_IDLE_CHECK_LIMIT;
+	} else {
+		idle.tv_sec = 0;
+		idle.tv_usec = 0;
 	}
+
 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
 			continue;
@@ -1046,29 +1198,65 @@ slapd_daemon_task(
 		 * listening port. The listen() and accept() calls
 		 * are unnecessary.
 		 */
-		if ( slap_listeners[l]->sl_is_udp )
-		{
-			slapd_add( slap_listeners[l]->sl_sd );
+		if ( slap_listeners[l]->sl_is_udp ) {
+			slapd_add( slap_listeners[l]->sl_sd, 1 );
 			continue;
 		}
 #endif
 
 		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
 			int err = sock_errno();
+
+#ifdef LDAP_PF_INET6
+			/* If error is EADDRINUSE, we are trying to listen to INADDR_ANY and
+			 * we are already listening to in6addr_any, then we want to ignore
+			 * this and continue.
+			 */
+			if ( err == EADDRINUSE ) {
+				int i;
+				struct sockaddr_in sa = slap_listeners[l]->sl_sa.sa_in_addr;
+				struct sockaddr_in6 sa6;
+				
+				if ( sa.sin_family == AF_INET &&
+				     sa.sin_addr.s_addr == htonl(INADDR_ANY) ) {
+					for ( i = 0 ; i < l; i++ ) {
+						sa6 = slap_listeners[i]->sl_sa.sa_in6_addr;
+						if ( sa6.sin6_family == AF_INET6 &&
+						     !memcmp( &sa6.sin6_addr, &in6addr_any, sizeof(struct in6_addr) ) )
+							break;
+					}
+
+					if ( i < l ) {
+						/* We are already listening to in6addr_any */
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-				   "slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n",
-				   slap_listeners[l]->sl_url, err, sock_errstr(err) ));
+						LDAP_LOG(CONNECTION, WARNING,
+							   "slapd_daemon_task: Attempt to listen to 0.0.0.0 failed, already listening on ::, assuming IPv4 included\n", 0, 0, 0 );
+#else
+						Debug( LDAP_DEBUG_CONNS,
+						       "daemon: Attempt to listen to 0.0.0.0 failed, already listening on ::, assuming IPv4 included\n",
+						       0, 0, 0 );
+#endif
+						slapd_close( slap_listeners[l]->sl_sd );
+						slap_listeners[l]->sl_sd = AC_SOCKET_INVALID;
+						continue;
+					}
+				}
+			}
+#endif				
+#ifdef NEW_LOGGING
+			LDAP_LOG( CONNECTION, ERR, 
+				"slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n",
+				slap_listeners[l]->sl_url.bv_val, err, sock_errstr(err) );
 #else
 			Debug( LDAP_DEBUG_ANY,
 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-					slap_listeners[l]->sl_url, err,
+					slap_listeners[l]->sl_url.bv_val, err,
 					sock_errstr(err) );
 #endif
 			return( (void*)-1 );
 		}
 
-		slapd_add( slap_listeners[l]->sl_sd );
+		slapd_add( slap_listeners[l]->sl_sd, 0 );
 	}
 
 #ifdef HAVE_NT_SERVICE_MANAGER
@@ -1085,32 +1273,28 @@ slapd_daemon_task(
 		ber_socket_t nfds;
 #define SLAPD_EBADF_LIMIT 16
 		int ebadf = 0;
-		int emfile = 0;
 
-#define SLAPD_IDLE_CHECK_LIMIT 4
 		time_t	now;
 
-
 		fd_set			readfds;
 		fd_set			writefds;
 		Sockaddr		from;
 
-#if defined(SLAPD_RLOOKUPS)
-		struct hostent		*hp;
-#endif
-		struct timeval		zero;
+		struct timeval		tv;
 		struct timeval		*tvp;
 
-		if( emfile ) {
-			now = slap_get_time();
+		struct timeval		*cat;
+		time_t				tdelta = 1;
+		struct re_s*		rtask;
+		now = slap_get_time();
+
+		if( ( global_idletimeout > 0 ) &&
+			difftime( last_idle_check +
+			global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) {
 			connections_timeout_idle( now );
+			last_idle_check = now;
 		}
-		else if ( global_idletimeout > 0 ) {
-			now = slap_get_time();
-			if ( difftime( last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) {
-				connections_timeout_idle( now );
-			}
-		}
+		tv = idle;
 
 #ifdef SIGHUP
 		if( slapd_gentle_shutdown ) {
@@ -1136,8 +1320,7 @@ slapd_daemon_task(
 		FD_ZERO( &writefds );
 		FD_ZERO( &readfds );
 
-		zero.tv_sec = 0;
-		zero.tv_usec = 0;
+		at = 0;
 
 		ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
@@ -1160,6 +1343,9 @@ slapd_daemon_task(
 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
 			if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
 				continue;
+			if ( slap_listeners[l]->sl_is_mute )
+				FD_CLR( slap_listeners[l]->sl_sd, &readfds );
+			else
 			if (!FD_ISSET(slap_listeners[l]->sl_sd, &readfds))
 			    FD_SET( slap_listeners[l]->sl_sd, &readfds );
 		}
@@ -1169,25 +1355,58 @@ slapd_daemon_task(
 #else
 		nfds = dtblsize;
 #endif
+		if ( global_idletimeout && slap_daemon.sd_nactives )
+			at = 1;
 
 		ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 
-		at = ldap_pvt_thread_pool_backload(&connection_pool);
-
-#if defined( HAVE_YIELDING_SELECT ) || defined( NO_THREADS )
-		tvp = NULL;
-#else
-		tvp = at ? &zero : NULL;
+		if ( at 
+#if defined(HAVE_YIELDING_SELECT) || defined(NO_THREADS)
+			&&  ( tv.tv_sec || tv.tv_usec )
 #endif
+			)
+			tvp = &tv;
+		else
+			tvp = NULL;
+
+		ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
+		rtask = ldap_pvt_runqueue_next_sched( &syncrepl_rq, &cat );
+		while ( cat && cat->tv_sec && cat->tv_sec <= now ) {
+			if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) {
+				ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 );
+			} else {
+				ldap_pvt_runqueue_runtask( &syncrepl_rq, rtask );
+				ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 );
+				ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+				ldap_pvt_thread_pool_submit( &connection_pool,
+											rtask->routine, (void *) rtask );
+				ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
+			}
+			rtask = ldap_pvt_runqueue_next_sched( &syncrepl_rq, &cat );
+		}
+		ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+
+		if ( cat != NULL ) {
+			time_t diff = difftime( cat->tv_sec, now );
+			if ( diff == 0 )
+				diff = tdelta;
+			if ( tvp == NULL || diff < tv.tv_sec ) {
+				tv.tv_sec = diff;
+				tv.tv_usec = 0;
+				tvp = &tv;
+			}
+		}
 
 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-			if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
+			if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID ||
+			    slap_listeners[l]->sl_is_mute )
 				continue;
 
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-				   "slapd_daemon_task: select: listen=%d active_threads=%d tvp=%s\n",
-				   slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" ));
+			LDAP_LOG( CONNECTION, DETAIL1, 
+				"slapd_daemon_task: select: listen=%d "
+				"active_threads=%d tvp=%s\n",
+				slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" );
 #else
 			Debug( LDAP_DEBUG_CONNS,
 				"daemon: select: listen=%d active_threads=%d tvp=%s\n",
@@ -1220,9 +1439,9 @@ slapd_daemon_task(
 
 				if( err != EINTR ) {
 #ifdef NEW_LOGGING
-					LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-						   "slapd_daemon_task: select failed (%d): %s\n",
-						   err, sock_errstr(err) ));
+					LDAP_LOG( CONNECTION, INFO, 
+						"slapd_daemon_task: select failed (%d): %s\n",
+						err, sock_errstr(err), 0 );
 #else
 					Debug( LDAP_DEBUG_CONNS,
 						"daemon: select failed (%d): %s\n",
@@ -1236,12 +1455,13 @@ slapd_daemon_task(
 		case 0:		/* timeout - let threads run */
 			ebadf = 0;
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   "slapd_daemon_task: select timeout - yielding\n" ));
+			LDAP_LOG( CONNECTION, DETAIL2,
+				   "slapd_daemon_task: select timeout - yielding\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n",
 			    0, 0, 0 );
 #endif
+
 			ldap_pvt_thread_yield();
 			continue;
 
@@ -1250,8 +1470,8 @@ slapd_daemon_task(
 
 			ebadf = 0;
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   "slapd_daemon_task: activity on %d descriptors\n", ns ));
+			LDAP_LOG( CONNECTION, DETAIL2, 
+				   "slapd_daemon_task: activity on %d descriptors\n", ns, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS, "daemon: activity on %d descriptors\n",
 				ns, 0, 0 );
@@ -1262,7 +1482,7 @@ slapd_daemon_task(
 		if( FD_ISSET( wake_sds[0], &readfds ) ) {
 			char c[BUFSIZ];
 			tcp_read( wake_sds[0], c, sizeof(c) );
-#ifdef NO_THREADS
+#if defined(NO_THREADS) || defined(HAVE_GNU_PTH)
 			waking = 0;
 #endif
 			continue;
@@ -1274,9 +1494,12 @@ slapd_daemon_task(
 			long id;
 			slap_ssf_t ssf = 0;
 			char *authid = NULL;
+#ifdef SLAPD_RLOOKUPS
+			char hbuf[NI_MAXHOST];
+#endif
 
 			char	*dnsname = NULL;
-			char	*peeraddr;
+			char	*peeraddr = NULL;
 #ifdef LDAP_PF_LOCAL
 			char	peername[MAXPATHLEN + sizeof("PATH=")];
 #elif defined(LDAP_PF_INET6)
@@ -1292,78 +1515,71 @@ slapd_daemon_task(
 
 			if ( !FD_ISSET( slap_listeners[l]->sl_sd, &readfds ) )
 				continue;
-
+			
 #ifdef LDAP_CONNECTIONLESS
-			if ( slap_listeners[l]->sl_is_udp )
-			{
-			/* The first time we receive a query, we set this
-			 * up as a "connection". It remains open for the life
-			 * of the slapd.
-			 */
-				if ( slap_listeners[l]->sl_is_udp < 2 )
-				{
+			if ( slap_listeners[l]->sl_is_udp ) {
+				/* The first time we receive a query, we set this
+				 * up as a "connection". It remains open for the life
+				 * of the slapd.
+				 */
+				if ( slap_listeners[l]->sl_is_udp < 2 ) {
 				    id = connection_init(
-				    	slap_listeners[l]->sl_sd,
-					slap_listeners[l]->sl_url, "", "",
-					slap_listeners[l]->sl_name,
-					2, ssf, authid );
+					slap_listeners[l]->sl_sd,
+				    	slap_listeners[l], "", "",
+					CONN_IS_UDP, ssf, authid );
 				    slap_listeners[l]->sl_is_udp++;
 				}
 				continue;
 			}
 #endif
 
+			/* Don't need to look at this in the data loops */
+			FD_CLR( slap_listeners[l]->sl_sd, &readfds );
+			FD_CLR( slap_listeners[l]->sl_sd, &writefds );
+
 			s = accept( slap_listeners[l]->sl_sd,
 				(struct sockaddr *) &from, &len );
 			if ( s == AC_SOCKET_INVALID ) {
 				int err = sock_errno();
 
+				if(
 #ifdef EMFILE
-				if( err == EMFILE ) {
-					emfile++;
-				} else
+				    err == EMFILE ||
 #endif
 #ifdef ENFILE
-				if( err == ENFILE ) {
-					emfile++;
-				} else 
+				    err == ENFILE ||
 #endif
+				    0 )
 				{
-					emfile=0;
+					ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
+					emfile++;
+					/* Stop listening until an existing session closes */
+					slap_listeners[l]->sl_is_mute = 1;
+					ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 				}
 
-				if( emfile < 3 ) {
 #ifdef NEW_LOGGING
-					LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-						"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
-						(long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
+				LDAP_LOG( CONNECTION, ERR, 
+					"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
+					(long)slap_listeners[l]->sl_sd, 
+					err, sock_errstr(err) );
 #else
-					Debug( LDAP_DEBUG_ANY,
-					    "daemon: accept(%ld) failed errno=%d (%s)\n",
-					    (long) slap_listeners[l]->sl_sd, err,
-					    sock_errstr(err) );
-#endif
-				} else {
-					/* prevent busy loop */
-#  ifdef HAVE_USLEEP
-					if( emfile % 4 == 3 ) usleep( 250 );
-#  else
-					if( emfile % 8 == 7 ) sleep( 1 );
-#  endif
-				}
-
+				Debug( LDAP_DEBUG_ANY,
+					"daemon: accept(%ld) failed errno=%d (%s)\n",
+					(long) slap_listeners[l]->sl_sd, err,
+					sock_errstr(err) );
+#endif
 				ldap_pvt_thread_yield();
 				continue;
 			}
-			emfile = 0;
 
 #ifndef HAVE_WINSOCK
 			/* make sure descriptor number isn't too great */
 			if ( s >= dtblsize ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+				LDAP_LOG( CONNECTION, ERR, 
 				   "slapd_daemon_task: %ld beyond descriptor table size %ld\n",
-				   (long)s, (long)dtblsize ));
+				   (long)s, (long)dtblsize, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"daemon: %ld beyond descriptor table size %ld\n",
@@ -1403,9 +1619,10 @@ slapd_daemon_task(
 				if ( rc == AC_SOCKET_ERROR ) {
 					int err = sock_errno();
 #ifdef NEW_LOGGING
-					LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-						   "slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE) failed errno=%d (%s)\n",
-						   (long)s, err, sock_errstr(err) ));
+					LDAP_LOG( CONNECTION, ERR, 
+						"slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE)"
+					   " failed errno=%d (%s)\n",
+						(long)s, err, sock_errstr(err) );
 #else
 					Debug( LDAP_DEBUG_ANY,
 						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
@@ -1421,9 +1638,10 @@ slapd_daemon_task(
 				if ( rc == AC_SOCKET_ERROR ) {
 					int err = sock_errno();
 #ifdef NEW_LOGGING
-					LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-						   "slapd_daemon_task: setsockopt( %ld, TCP_NODELAY) failed errno=%d (%s)\n",
-						   (long)s, err, sock_errstr(err) ));
+					LDAP_LOG( CONNECTION, ERR, 
+						"slapd_daemon_task: setsockopt( %ld, "
+						"TCP_NODELAY) failed errno=%d (%s)\n",
+						(long)s, err, sock_errstr(err) );
 #else
 					Debug( LDAP_DEBUG_ANY,
 						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
@@ -1435,8 +1653,8 @@ slapd_daemon_task(
 #endif
 
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-				   "slapd_daemon_task: new connection on %ld\n", (long)s ));
+			LDAP_LOG( CONNECTION, DETAIL1, 
+				"slapd_daemon_task: new connection on %ld\n", (long)s, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
 				(long) s, 0, 0 );
@@ -1446,6 +1664,19 @@ slapd_daemon_task(
 			case AF_LOCAL:
 				sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path );
 				ssf = LDAP_PVT_SASL_LOCAL_SSF;
+				{
+					uid_t uid;
+					gid_t gid;
+
+					if( getpeereid( s, &uid, &gid ) == 0 ) {
+						authid = ch_malloc(
+							sizeof("uidnumber=4294967295+gidnumber=4294967295,"
+								"cn=peercred,cn=external,cn=auth"));
+						sprintf(authid, "uidnumber=%d+gidnumber=%d,"
+							"cn=peercred,cn=external,cn=auth",
+							(int) uid, (int) gid);
+					}
+				}
 				dnsname = "local";
 				break;
 #endif /* LDAP_PF_LOCAL */
@@ -1456,14 +1687,16 @@ slapd_daemon_task(
 				peeraddr = inet_ntoa( *((struct in_addr *)
 							&from.sa_in6_addr.sin6_addr.s6_addr[12]) );
 				sprintf( peername, "IP=%s:%d",
-					 peeraddr != NULL ? peeraddr : "unknown",
+					 peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
 					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
 			} else {
 				char addr[INET6_ADDRSTRLEN];
+
+				peeraddr = (char *) inet_ntop( AF_INET6,
+						      &from.sa_in6_addr.sin6_addr,
+						      addr, sizeof addr );
 				sprintf( peername, "IP=%s %d",
-					 inet_ntop( AF_INET6,
-						    &from.sa_in6_addr.sin6_addr,
-						    addr, sizeof addr) ? addr : "unknown",
+					 peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
 					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
 			}
 			break;
@@ -1472,7 +1705,7 @@ slapd_daemon_task(
 			case AF_INET:
 			peeraddr = inet_ntoa( from.sa_in_addr.sin_addr );
 			sprintf( peername, "IP=%s:%d",
-				peeraddr != NULL ? peeraddr : "unknown",
+				peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
 				(unsigned) ntohs( from.sa_in_addr.sin_port ) );
 				break;
 
@@ -1488,19 +1721,12 @@ slapd_daemon_task(
 			) {
 #ifdef SLAPD_RLOOKUPS
 				if ( use_reverse_lookup ) {
-#  ifdef LDAP_PF_INET6
-					if ( from.sa_addr.sa_family == AF_INET6 )
-						hp = gethostbyaddr(
-							(char *)&(from.sa_in6_addr.sin6_addr),
-							sizeof(from.sa_in6_addr.sin6_addr),
-							AF_INET6 );
-					else
-#  endif /* LDAP_PF_INET6 */
-					hp = gethostbyaddr(
-						(char *) &(from.sa_in_addr.sin_addr),
-						sizeof(from.sa_in_addr.sin_addr),
-						AF_INET );
-					dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL;
+					char *herr;
+					if (ldap_pvt_get_hname( (const struct sockaddr *)&from, len, hbuf,
+						sizeof(hbuf), &herr ) == 0) {
+						ldap_pvt_str2lower( hbuf );
+						dnsname = hbuf;
+					}
 				}
 #else
 				dnsname = NULL;
@@ -1508,16 +1734,16 @@ slapd_daemon_task(
 
 #ifdef HAVE_TCPD
 				if ( !hosts_ctl("slapd",
-						dnsname != NULL ? dnsname : STRING_UNKNOWN,
-						peeraddr != NULL ? peeraddr : STRING_UNKNOWN,
-						STRING_UNKNOWN ))
+						dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
+						peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
+						SLAP_STRING_UNKNOWN ))
 				{
 					/* DENY ACCESS */
-					Statslog( LDAP_DEBUG_ANY,
-						"fd=%ld host access from %s (%s) denied.\n",
+					Statslog( LDAP_DEBUG_STATS,
+						"fd=%ld DENIED from %s (%s)\n",
 						(long) s,
-						dnsname != NULL ? dnsname : "unknown",
-						peeraddr != NULL ? peeraddr : "unknown",
+						dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
+						peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
 						0, 0 );
 					slapd_close(s);
 					continue;
@@ -1526,12 +1752,11 @@ slapd_daemon_task(
 			}
 
 			id = connection_init(s,
-				slap_listeners[l]->sl_url,
-				dnsname != NULL ? dnsname : "unknown",
+				slap_listeners[l],
+				dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
 				peername,
-				slap_listeners[l]->sl_name,
 #ifdef HAVE_TLS
-				slap_listeners[l]->sl_is_tls,
+				slap_listeners[l]->sl_is_tls ? CONN_IS_TLS : 0,
 #else
 				0,
 #endif
@@ -1542,43 +1767,47 @@ slapd_daemon_task(
 
 			if( id < 0 ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-					   "slapd_daemon_task: connection_init(%ld, %s, %s) failed.\n",
-					   (long)s, peername, slap_listeners[l]->sl_name ));
+				LDAP_LOG( CONNECTION, INFO, 
+					"slapd_daemon_task: "
+					"connection_init(%ld, %s, %s) "
+					"failed.\n",
+					(long)s, peername, 
+					slap_listeners[l]->sl_name.bv_val );
 #else
 				Debug( LDAP_DEBUG_ANY,
-					"daemon: connection_init(%ld, %s, %s) failed.\n",
+					"daemon: connection_init(%ld, %s, %s) "
+					"failed.\n",
 					(long) s,
 					peername,
-					slap_listeners[l]->sl_name );
+					slap_listeners[l]->sl_name.bv_val );
 #endif
 				slapd_close(s);
 				continue;
 			}
 
 			Statslog( LDAP_DEBUG_STATS,
-				"daemon: conn=%ld fd=%ld connection from %s (%s) accepted.\n",
+				"conn=%ld fd=%ld ACCEPT from %s (%s)\n",
 				id, (long) s,
 				peername,
-				slap_listeners[l]->sl_name,
+				slap_listeners[l]->sl_name.bv_val,
 				0 );
 
-			slapd_add( s );
+			slapd_add( s, 1 );
 			continue;
 		}
 
 #ifdef LDAP_DEBUG
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-			   "slapd_daemon_task: activity on " ));
+		LDAP_LOG( CONNECTION, DETAIL2,
+			   "slapd_daemon_task: activity on ", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 );
 #endif
 #ifdef HAVE_WINSOCK
 		for ( i = 0; i < readfds.fd_count; i++ ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   " %d%s", readfds.fd_array[i], "r", 0 ));
+			LDAP_LOG( CONNECTION, DETAIL2, 
+				" %d%s", readfds.fd_array[i], "r", 0, 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS, " %d%s",
 				readfds.fd_array[i], "r", 0 );
@@ -1586,8 +1815,8 @@ slapd_daemon_task(
 		}
 		for ( i = 0; i < writefds.fd_count; i++ ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   " %d%s", writefds.fd_array[i], "w" ));
+			LDAP_LOG( CONNECTION, DETAIL2, 
+				" %d%s", writefds.fd_array[i], "w" , 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS, " %d%s",
 				writefds.fd_array[i], "w", 0 );
@@ -1597,31 +1826,13 @@ slapd_daemon_task(
 #else
 		for ( i = 0; i < nfds; i++ ) {
 			int	r, w;
-			int	is_listener = 0;
 
-			for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-				if ( i == slap_listeners[l]->sl_sd ) {
-#ifdef LDAP_CONNECTIONLESS
-				/* The listener is the data port. Don't
-				 * skip it.
-				 */
-					if (slap_listeners[l]->sl_is_udp)
-						continue;
-#endif
-					is_listener = 1;
-					break;
-				}
-			}
-			if ( is_listener ) {
-				continue;
-			}
 			r = FD_ISSET( i, &readfds );
 			w = FD_ISSET( i, &writefds );
 			if ( r || w ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-					   " %d%s%s", i,
-					   r ? "r" : "", w ? "w" : "" ));
+				LDAP_LOG( CONNECTION, DETAIL2, 
+					" %d%s%s", i, r ? "r" : "", w ? "w" : "" );
 #else
 				Debug( LDAP_DEBUG_CONNS, " %d%s%s", i,
 				    r ? "r" : "", w ? "w" : "" );
@@ -1630,7 +1841,7 @@ slapd_daemon_task(
 		}
 #endif
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, "\n" ));
+		LDAP_LOG( CONNECTION, DETAIL2, "\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 );
 #endif
@@ -1645,7 +1856,6 @@ slapd_daemon_task(
 #endif
 		{
 			ber_socket_t wd;
-			int is_listener = 0;
 #ifdef HAVE_WINSOCK
 			wd = writefds.fd_array[i];
 #else
@@ -1655,22 +1865,9 @@ slapd_daemon_task(
 			wd = i;
 #endif
 
-			for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-				if ( i == slap_listeners[l]->sl_sd ) {
-#ifdef LDAP_CONNECTIONLESS
-					if (slap_listeners[l]->sl_is_udp)
-						continue;
-#endif
-					is_listener = 1;
-					break;
-				}
-			}
-			if ( is_listener ) {
-				continue;
-			}
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   "slapd_daemon_task: write active on %d\n", wd ));
+			LDAP_LOG( CONNECTION, DETAIL2, 
+				"slapd_daemon_task: write active on %d\n", wd, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_CONNS,
 				"daemon: write active on %d\n",
@@ -1696,8 +1893,6 @@ slapd_daemon_task(
 #endif
 		{
 			ber_socket_t rd;
-			int is_listener = 0;
-
 #ifdef HAVE_WINSOCK
 			rd = readfds.fd_array[i];
 #else
@@ -1707,23 +1902,9 @@ slapd_daemon_task(
 			rd = i;
 #endif
 
-			for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-				if ( rd == slap_listeners[l]->sl_sd ) {
-#ifdef LDAP_CONNECTIONLESS
-					if (slap_listeners[l]->sl_is_udp)
-						continue;
-#endif
-					is_listener = 1;
-					break;
-				}
-			}
-			if ( is_listener ) {
-				continue;
-			}
-
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
-				   "slapd_daemon_task: read activity on %d\n", rd ));
+			LDAP_LOG( CONNECTION, DETAIL2, 
+				"slapd_daemon_task: read activity on %d\n", rd, 0, 0 );
 #else
 			Debug ( LDAP_DEBUG_CONNS,
 				"daemon: read activity on %d\n", rd, 0, 0 );
@@ -1744,8 +1925,8 @@ slapd_daemon_task(
 
 	if( slapd_shutdown == 1 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-			   "slapd_daemon_task: shutdown requested and initiated.\n"));
+		LDAP_LOG( CONNECTION, CRIT,
+		   "slapd_daemon_task: shutdown requested and initiated.\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE,
 			"daemon: shutdown requested and initiated.\n",
@@ -1755,8 +1936,9 @@ slapd_daemon_task(
 	} else if ( slapd_shutdown == 2 ) {
 #ifdef HAVE_NT_SERVICE_MANAGER
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-				   "slapd_daemon_task: shutdown initiated by Service Manager.\n"));
+			LDAP_LOG( CONNECTION, CRIT,
+			   "slapd_daemon_task: shutdown initiated by Service Manager.\n",
+			   0, 0, 0);
 #else
 			Debug( LDAP_DEBUG_TRACE,
 			       "daemon: shutdown initiated by Service Manager.\n",
@@ -1764,8 +1946,9 @@ slapd_daemon_task(
 #endif
 #else /* !HAVE_NT_SERVICE_MANAGER */
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-				   "slapd_daemon_task: abnormal condition, shutdown initiated.\n" ));
+			LDAP_LOG( CONNECTION, CRIT,
+			   "slapd_daemon_task: abnormal condition, "
+			   "shutdown initiated.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE,
 			       "daemon: abnormal condition, shutdown initiated.\n",
@@ -1774,8 +1957,9 @@ slapd_daemon_task(
 #endif /* !HAVE_NT_SERVICE_MANAGER */
 	} else {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-			   "slapd_daemon_task: no active streams, shutdown initiated.\n" ));
+		LDAP_LOG( CONNECTION, CRIT,
+		   "slapd_daemon_task: no active streams, shutdown initiated.\n", 
+		   0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE,
 		       "daemon: no active streams, shutdown initiated.\n",
@@ -1783,15 +1967,22 @@ slapd_daemon_task(
 #endif
 	}
 
-	if( slapd_gentle_shutdown != 2 )
+	if( slapd_gentle_shutdown != 2 ) {
 		close_listeners ( 0 );
+	}
+
 	free ( slap_listeners );
 	slap_listeners = NULL;
 
+	if( !slapd_gentle_shutdown ) {
+		slapd_abrupt_shutdown = 1;
+		connections_shutdown();
+	}
+
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-		   "slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",
-		   ldap_pvt_thread_pool_backload(&connection_pool) ));
+	LDAP_LOG( CONNECTION, CRIT, 
+		"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",
+		ldap_pvt_thread_pool_backload(&connection_pool), 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ANY,
 	    "slapd shutdown: waiting for %d threads to terminate\n",
@@ -1820,8 +2011,9 @@ int slapd_daemon( void )
 
 		if ( rc != 0 ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-				   "slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n", rc ));
+			LDAP_LOG( CONNECTION, ERR, 
+				"slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n",
+				rc, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY,
 			"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
@@ -1893,11 +2085,13 @@ int sockdestroy(void)
 RETSIGTYPE
 slap_sig_shutdown( int sig )
 {
+#if 0
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-		   "slap_sig_shutdown: signal %d\n", sig ));
+	LDAP_LOG( CONNECTION, CRIT, 
+		"slap_sig_shutdown: signal %d\n", sig, 0, 0 );
 #else
 	Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0);
+#endif
 #endif
 
 	/*
@@ -1908,13 +2102,7 @@ slap_sig_shutdown( int sig )
 
 #if HAVE_NT_SERVICE_MANAGER && SIGBREAK
 	if (is_NT_Service && sig == SIGBREAK)
-#ifdef NEW_LOGGING
-	    LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
-		       "slap_sig_shutdown: SIGBREAK ignored.\n" ));
-#else
-	    Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
-		  0, 0, 0);
-#endif
+		;
 	else
 #endif
 #ifdef SIGHUP
@@ -1940,8 +2128,8 @@ slap_sig_wake( int sig )
 }
 
 
-void slapd_add_internal(ber_socket_t s) {
-	slapd_add(s);
+void slapd_add_internal(ber_socket_t s, int isactive) {
+	slapd_add(s, isactive);
 }
 
 Listener ** slapd_get_listeners(void) {