]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/daemon.c
add new ber dump routine (behind NEW_LOGGING)
[openldap] / servers / slapd / daemon.c
index 32cdf25d292d252d1e829faebddd27964006a169..c9eb693cdcf880cb4a0ffcbbdb43b66025f7fd9c 100644 (file)
@@ -1,5 +1,10 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
 #include "portable.h"
-//#include "portable_err.h"
 
 #include <stdio.h>
 
@@ -11,7 +16,8 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_defaults.h"
+#include "ldap_pvt.h"
+#include "lutil.h"
 #include "slap.h"
 
 #ifdef HAVE_TCPD
@@ -21,33 +27,55 @@ int allow_severity = LOG_INFO;
 int deny_severity = LOG_NOTICE;
 #endif /* TCP Wrappers */
 
+#ifdef LDAP_PF_LOCAL
+#include <sys/stat.h>
+#endif /* LDAP_PF_LOCAL */
+
 /* globals */
-int dtblsize;
-static int tcps;
+time_t starttime;
+ber_socket_t dtblsize;
+
+typedef union slap_sockaddr {
+       struct sockaddr sa_addr;
+       struct sockaddr_in sa_in_addr;
+#ifdef LDAP_PF_INET6
+       struct sockaddr_in6 sa_in6_addr;
+#endif
+#ifdef LDAP_PF_LOCAL
+       struct sockaddr_un sa_un_addr;
+#endif
+} Sockaddr;
 
-#ifdef HAVE_WINSOCK2
-// in nt_main.c
-extern ldap_pvt_thread_cond_t                  started_event;
-/* forward reference */
-void hit_socket();
-/* In wsa_err.c */
-char *WSAGetLastErrorString();
-static ldap_pvt_thread_t hit_tid;
+typedef struct slap_listener {
+       char* sl_url;
+       char* sl_name;
+#ifdef HAVE_TLS
+       int             sl_is_tls;
+#endif
+       ber_socket_t            sl_sd;
+       Sockaddr sl_sa;
+#define sl_addr        sl_sa.sa_in_addr
+} Listener;
+
+Listener **slap_listeners = NULL;
+
+#define SLAPD_LISTEN 10
 
+static ber_socket_t wake_sds[2];
+
+#ifdef NO_THREADS
+static int waking;
 #define WAKE_LISTENER(w) \
-do {\
-    if( w ) {\
-        ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );\
-        hit_socket(); \
-    }\
-} while(0)
+((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0)
 #else
 #define WAKE_LISTENER(w) \
-do {\
-    if( w ) {\
-        ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );\
-    }\
-} while(0)
+do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
+#endif
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+/* in nt_main.c */
+extern ldap_pvt_thread_cond_t                  started_event;
+extern int       is_NT_Service;
 #endif
 
 #ifndef HAVE_WINSOCK
@@ -55,12 +83,7 @@ static
 #endif
 volatile sig_atomic_t slapd_shutdown = 0;
 
-static int daemon_initialized = 0;
-static ldap_pvt_thread_t       listener_tid;
-static volatile sig_atomic_t slapd_listener = 0;
-void sockinit();
-
-struct slap_daemon {
+static struct slap_daemon {
        ldap_pvt_thread_mutex_t sd_mutex;
 
        int sd_nactives;
@@ -79,7 +102,7 @@ struct slap_daemon {
 /*
  * Add a descriptor to daemon control
  */
-static void slapd_add(int s) {
+static void slapd_add(ber_socket_t s) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
        assert( !FD_ISSET( s, &slap_daemon.sd_actives ));
@@ -92,10 +115,11 @@ static void slapd_add(int s) {
        }
 #endif
 
-       FD_SET( (unsigned) s, &slap_daemon.sd_actives );
-       FD_SET( (unsigned) s, &slap_daemon.sd_readers );
+       FD_SET( s, &slap_daemon.sd_actives );
+       FD_SET( s, &slap_daemon.sd_readers );
 
-       Debug( LDAP_DEBUG_CONNS, "daemon: added %d%s%s\n", s,
+       Debug( LDAP_DEBUG_CONNS, "daemon: added %ld%s%s\n",
+               (long) s,
            FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
                FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" );
 
@@ -105,242 +129,624 @@ static void slapd_add(int s) {
 /*
  * Remove the descriptor from daemon control
  */
-void slapd_remove(int s, int wake) {
+void slapd_remove(ber_socket_t s, int wake) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
-       WAKE_LISTENER(wake);
 
-       Debug( LDAP_DEBUG_CONNS, "daemon: removing %d%s%s\n", s,
+       Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n",
+               (long) s,
            FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
                FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" );
 
-       FD_CLR( (unsigned) s, &slap_daemon.sd_actives );
-       FD_CLR( (unsigned) s, &slap_daemon.sd_readers );
-       FD_CLR( (unsigned) s, &slap_daemon.sd_writers );
+       FD_CLR( s, &slap_daemon.sd_actives );
+       FD_CLR( s, &slap_daemon.sd_readers );
+       FD_CLR( s, &slap_daemon.sd_writers );
 
        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
+       WAKE_LISTENER(wake);
 }
 
-void slapd_clr_write(int s, int wake) {
+void slapd_clr_write(ber_socket_t s, int wake) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
-       WAKE_LISTENER(wake);
 
-       assert( FD_ISSET( (unsigned) s, &slap_daemon.sd_actives) );
-       FD_CLR( (unsigned) s, &slap_daemon.sd_writers );
+       assert( FD_ISSET( s, &slap_daemon.sd_actives) );
+       FD_CLR( s, &slap_daemon.sd_writers );
 
        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
-       if( wake ) {
-               ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
-       }
+       WAKE_LISTENER(wake);
 }
 
-void slapd_set_write(int s, int wake) {
+void slapd_set_write(ber_socket_t s, int wake) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
-    WAKE_LISTENER(wake);
 
        assert( FD_ISSET( s, &slap_daemon.sd_actives) );
-       FD_SET( (unsigned) s, &slap_daemon.sd_writers );
+       if (!FD_ISSET(s, &slap_daemon.sd_writers))
+           FD_SET( (unsigned) s, &slap_daemon.sd_writers );
 
        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
-       if( wake ) {
-               ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
-       }
+       WAKE_LISTENER(wake);
 }
 
-void slapd_clr_read(int s, int wake) {
+void slapd_clr_read(ber_socket_t s, int wake) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
-    WAKE_LISTENER(wake);
 
        assert( FD_ISSET( s, &slap_daemon.sd_actives) );
-       FD_CLR( (unsigned) s, &slap_daemon.sd_readers );
+       FD_CLR( s, &slap_daemon.sd_readers );
 
        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
-       if( wake ) {
-               ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
-       }
+       WAKE_LISTENER(wake);
 }
 
-void slapd_set_read(int s, int wake) {
+void slapd_set_read(ber_socket_t s, int wake) {
        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
-    WAKE_LISTENER(wake);
 
        assert( FD_ISSET( s, &slap_daemon.sd_actives) );
-       FD_SET( (unsigned) s, &slap_daemon.sd_readers );
+       if (!FD_ISSET(s, &slap_daemon.sd_readers))
+           FD_SET( s, &slap_daemon.sd_readers );
 
        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
-       if( wake ) {
-               ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
-       }
+       WAKE_LISTENER(wake);
 }
 
-static void slapd_close(int s) {
-       Debug( LDAP_DEBUG_CONNS, "daemon: closing %d\n", s, 0, 0 );
+static void slapd_close(ber_socket_t s) {
+       Debug( LDAP_DEBUG_CONNS, "daemon: closing %ld\n",
+               (long) s, 0, 0 );
        tcp_close(s);
 }
 
+static void slap_free_listener_addresses(struct sockaddr **sal)
+{
+       struct sockaddr **sap;
 
+       if (sal == NULL) {
+               return;
+       }
 
-int
-set_socket( struct sockaddr_in *addr )
+       for (sap = sal; *sap != NULL; sap++) {
+               ch_free(*sap);
+       }
+
+       ch_free(sal);
+}
+
+/* port = 0 indicates AF_LOCAL */
+static int slap_get_listener_addresses(
+       const char *host,
+       unsigned short port,
+       struct sockaddr ***sal)
 {
-       int     tcps = -1;
-    if ( !daemon_initialized ) sockinit();
+       struct sockaddr **sap;
+#ifdef HAVE_GETADDRINFO
+       struct addrinfo hints, *res, *sai;
+       int n, err;
+       
+       memset( &hints, '\0', sizeof(hints) );
+       hints.ai_flags = AI_PASSIVE;
+       hints.ai_socktype = SOCK_STREAM;
+#  ifdef LDAP_PF_LOCAL
+       if ( port == 0 ) {
+               hints.ai_family = AF_LOCAL;
+               /* host specifies a service in this case */
+               if (err = getaddrinfo(NULL, host, &hints, &res)) {
+                       Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
+                               AC_GAI_STRERROR(err), 0, 0);
+                       return -1;
+               }
+       } else
+#  endif
+       {               
+               char serv[7];
+       
+               snprintf(serv, sizeof serv, "%d", port);
+               hints.ai_family = AF_UNSPEC;
+               if (err = getaddrinfo(host, serv, &hints, &res)) {
+                       Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
+                               gai_strerror(err), 0, 0);
+                       return -1;
+               }
+       }
+
+       sai = res;
+       for (n=2; (sai = sai->ai_next) != NULL; n++) {
+               /* EMPTY */ ;
+       }
+       *sal = ch_malloc(n * sizeof(*sal));
+       if (*sal == NULL) {
+               return -1;
+       }
+
+       sai = res;
+       sap = *sal;
+       do {
+               switch (sai->ai_family) {
+#  ifdef LDAP_PF_LOCAL
+               case AF_LOCAL: {
+                       *sap = ch_malloc(sizeof(struct sockaddr_un));
+                       if (*sap == NULL) {
+                               freeaddrinfo(res);
+                               goto errexit;
+                       }
+                       *(struct sockaddr_un *)*sap =
+                               *((struct sockaddr_un *)sai->ai_addr);
+               } break;
+#  endif
+#  ifdef LDAP_PF_INET6                 
+               case AF_INET6: {
+                       *sap = ch_malloc(sizeof(struct sockaddr_in6));
+                       if (*sap == NULL) {
+                               freeaddrinfo(res);
+                               goto errexit;
+                       }
+                       *(struct sockaddr_in6 *)*sap =
+                               *((struct sockaddr_in6 *)sai->ai_addr);
+               } break;
+#  endif
+               case AF_INET: {
+                       *sap = ch_malloc(sizeof(struct sockaddr_in));
+                       if (*sap == NULL) {
+                               freeaddrinfo(res);
+                               goto errexit;
+                       }
+                       *(struct sockaddr_in *)*sap =
+                               *((struct sockaddr_in *)sai->ai_addr);
+               } break;
+               default: 
+                       *sap = NULL;
+                       break;
+               }
+               if (*sap != NULL) {
+                       (*sap)->sa_family = sai->ai_family;
+                       sap++;
+               }
+       } while ((sai = sai->ai_next) != NULL);
+
+       freeaddrinfo(res);
 
-#ifdef HAVE_SYSCONF
-       dtblsize = sysconf( _SC_OPEN_MAX );
-#elif HAVE_GETDTABLESIZE
-       dtblsize = getdtablesize();
 #else
-       dtblsize = FD_SETSIZE;
+#  ifdef LDAP_PF_LOCAL
+       if ( port == 0 ) {
+               *sal = ch_malloc(2 * sizeof(*sal));
+               if (*sal == NULL) {
+                       return -1;
+               }
+               sap = *sal;
+               *sap = ch_malloc(sizeof(struct sockaddr_un));
+               if (*sap == NULL)
+                       goto errexit;
+               (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
+               (*sap)->sa_family = AF_LOCAL;
+               if ( strlen(host) >
+                    (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
+                       Debug( LDAP_DEBUG_ANY,
+                              "daemon: domain socket path (%s) too long in URL",
+                              host, 0, 0);
+                       goto errexit;
+               }
+               strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
+       } else
+#  endif               
+       {
+               struct in_addr in;
+
+               if ( host == NULL ) {
+                       in.s_addr = htonl(INADDR_ANY);
+
+               } else if ( !inet_aton( host, &in ) ) {
+                       struct hostent *he = gethostbyname( host );
+                       if( he == NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                      "daemon: invalid host %s", host, 0, 0);
+                               return -1;
+                       }
+                       AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
+               }
+
+               *sal = ch_malloc(2 * sizeof(*sal));
+               if (*sal == NULL) {
+                       return -1;
+               }
+
+               sap = *sal;
+               *sap = ch_malloc(sizeof(struct sockaddr_in));
+               if (*sap == NULL) {
+                       goto errexit;
+               }
+
+               (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
+               (*sap)->sa_family = AF_INET;
+               ((struct sockaddr_in *)*sap)->sin_port = htons(port);
+               ((struct sockaddr_in *)*sap)->sin_addr = in;
+       }
+       sap++;
 #endif
 
-#ifdef FD_SETSIZE
-       if(dtblsize > FD_SETSIZE) {
-               dtblsize = FD_SETSIZE;
+       *sap = NULL;
+       return 0;
+
+errexit:
+       slap_free_listener_addresses(*sal);
+       return -1;
+}
+
+static Listener * slap_open_listener(
+       const char* url )
+{
+       int     tmp, rc;
+       Listener l;
+       Listener *li;
+       LDAPURLDesc *lud;
+       unsigned short port;
+       int err, addrlen;
+       struct sockaddr **sal, **psal;
+
+       rc = ldap_url_parse( url, &lud );
+
+       if( rc != LDAP_URL_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "daemon: listen URL \"%s\" parse error=%d\n",
+                       url, rc, 0 );
+               return NULL;
        }
-#endif /* !FD_SETSIZE */
 
-       if( addr != NULL ) {
-               int     tmp;
+#ifndef HAVE_TLS
+       if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "daemon: TLS not supported (%s)\n",
+                       url, 0, 0 );
+               ldap_free_urldesc( lud );
+               return NULL;
+       }
+
+       if(! lud->lud_port ) {
+               lud->lud_port = LDAP_PORT;
+       }
 
-               if ( (tcps = socket( AF_INET, SOCK_STREAM, 0 )) == -1 ) {
-#ifndef HAVE_WINSOCK
-                       int err = errno;
-                       Debug( LDAP_DEBUG_ANY,
-                               "daemon: socket() failed errno %d (%s)\n", err,
-                       err > -1 && err < sys_nerr ? sys_errlist[err] :
-                       "unknown", 0 );
 #else
-                       Debug( LDAP_DEBUG_ANY, 
-                               "daemon: socket() failed errno %d (%s)\n",
-                               WSAGetLastError(),
-                       WSAGetLastErrorString(), 0 );
+       l.sl_is_tls = ldap_pvt_url_scheme2tls( lud->lud_scheme );
+
+       if(! lud->lud_port ) {
+               lud->lud_port = l.sl_is_tls ? LDAPS_PORT : LDAP_PORT;
+       }
 #endif
-                       exit( 1 );
-               }
 
-#ifndef HAVE_WINSOCK
-               if ( tcps >= dtblsize ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "daemon: listener descriptor %d is too great\n",
-                               tcps, dtblsize, 0 );
-                       exit( 1 );
+       port = (unsigned short) lud->lud_port;
+       
+       if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
+#ifdef LDAP_PF_LOCAL
+               if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
+                       err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
+               } else {
+                       err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
                }
+#else
+               Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
+                       url, 0, 0);
+               ldap_free_urldesc( lud );
+               return NULL;
 #endif
-
-#ifdef SO_REUSEADDR
-               tmp = 1;
-               if ( setsockopt( tcps, SOL_SOCKET, SO_REUSEADDR,
-                       (char *) &tmp, sizeof(tmp) ) == -1 )
+       } else {
+               if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
+                       || strcmp(lud->lud_host, "*") == 0 )
                {
-                       int err = errno;
+                       err = slap_get_listener_addresses(NULL, port, &sal);
+               } else {
+                       err = slap_get_listener_addresses(lud->lud_host, port, &sal);
+               }
+       }
+
+       ldap_free_urldesc( lud );
+       if ( err ) {
+               return NULL;
+       }
+
+       psal = sal;
+       while ( *sal != NULL ) {
+               switch( (*sal)->sa_family ) {
+               case AF_INET:
+#ifdef LDAP_PF_INET6
+               case AF_INET6:
+#endif
+#ifdef LDAP_PF_LOCAL
+               case AF_LOCAL:
+#endif
+                       break;
+               default:
+                       sal++;
+                       continue;
+               }
+               l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
+               if ( l.sl_sd == AC_SOCKET_INVALID ) {
+                       int err = sock_errno();
                        Debug( LDAP_DEBUG_ANY,
-                              "slapd(%d): setsockopt() failed errno %d (%s)\n",
-                       tcps, err,
-                               err > -1 && err < sys_nerr
-                                       ? sys_errlist[err] : "unknown" );
+                               "daemon: socket() failed errno=%d (%s)\n", err,
+                               sock_errstr(err), 0 );
+                       sal++;
+                       continue;
+               }
+#ifndef HAVE_WINSOCK
+               if ( l.sl_sd >= dtblsize ) {
+                       Debug( LDAP_DEBUG_ANY,
+                              "daemon: listener descriptor %ld is too great %ld\n",
+                              (long) l.sl_sd, (long) dtblsize, 0 );
+                       tcp_close( l.sl_sd );
+                       sal++;
+                       continue;
                }
 #endif
-#ifdef SO_KEEPALIVE
-               tmp = 1;
-               if ( setsockopt( tcps, SOL_SOCKET, SO_KEEPALIVE,
-                       (char *) &tmp, sizeof(tmp) ) == -1 )
+#ifdef LDAP_PF_LOCAL
+               if ( (*sal)->sa_family == AF_LOCAL ) {
+                       unlink ( ((struct sockaddr_un *)*sal)->sun_path );
+               } else
+#endif
                {
-                       int err = errno;
-                       Debug( LDAP_DEBUG_ANY,
-                               "slapd(%d): setsockopt(KEEPALIVE) failed errno %d (%s)\n",
-                       tcps, err,
-                               err > -1 && err < sys_nerr
-                                       ? sys_errlist[err] : "unknown" );
+#ifdef SO_REUSEADDR
+                       /* enable address reuse */
+                       tmp = 1;
+                       rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
+                                        (char *) &tmp, sizeof(tmp) );
+                       if ( rc == AC_SOCKET_ERROR ) {
+                               int err = sock_errno();
+                               Debug( LDAP_DEBUG_ANY,
+                                      "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
+                                      (long) l.sl_sd, err, sock_errstr(err) );
+                       }
+#endif
                }
+       
+               switch( (*sal)->sa_family ) {
+               case AF_INET:
+                       addrlen = sizeof(struct sockaddr_in);
+                       break;
+#ifdef LDAP_PF_INET6
+               case AF_INET6:
+                       addrlen = sizeof(struct sockaddr_in6);
+                       break;
 #endif
+#ifdef LDAP_PF_LOCAL
+               case AF_LOCAL:
+                       addrlen = sizeof(struct sockaddr_un);
+                       break;
+#endif
+               }
+       
+               if (!bind(l.sl_sd, *sal, addrlen))
+                       break;
+               err = sock_errno();
+               Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
+                      (long) l.sl_sd, err, sock_errstr(err) );
+               tcp_close( l.sl_sd );
+               sal++;
+       } /* while ( *sal != NULL ) */
+
+       if ( *sal == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
+                       (long) l.sl_sd, 0, 0 );
+               slap_free_listener_addresses(psal);
+               return NULL;
+       }
 
-
-               if ( bind( tcps, (struct sockaddr *) addr, sizeof(*addr) ) == -1 ) {
-                       int err = errno;
-                       Debug( LDAP_DEBUG_ANY, "daemon: bind(%d) failed errno %d (%s)\n",
-                       tcps, err,
-                               err > -1 && err < sys_nerr
-                                       ? sys_errlist[err] : "unknown" );
-                       exit( 1 );
+       switch ( (*sal)->sa_family ) {
+#ifdef LDAP_PF_LOCAL
+       case AF_LOCAL: {
+               char *addr = ((struct sockaddr_un *)*sal)->sun_path;
+               if ( chmod( addr, S_IRWXU ) < 0 ) {
+                       int err = sock_errno();
+                       Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
+                              (long) l.sl_sd, err, sock_errstr(err) );
+                       tcp_close( l.sl_sd );
+                       slap_free_listener_addresses(psal);
+                       return NULL;
                }
+               l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
+               sprintf( l.sl_name, "PATH=%s", addr );
+       } break;
+#endif /* LDAP_PF_LOCAL */
+
+       case AF_INET: {
+               char *s;
+#ifdef HAVE_GETADDRINFO                
+               char addr[INET_ADDRSTRLEN];
+               inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
+                          addr, sizeof(addr) );
+               s = addr;
+#else
+               s = inet_ntoa( l.sl_addr.sin_addr );
+#endif         
+               l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
+               sprintf( l.sl_name, "IP=%s:%d",
+                        s != NULL ? s : "unknown" , port );
+       } break;
+
+#ifdef LDAP_PF_INET6
+       case AF_INET6: {
+               char addr[INET6_ADDRSTRLEN];
+               inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
+                          addr, sizeof addr);
+               l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
+               sprintf( l.sl_name, "IP=%s %d", addr, port );
+       } break;
+#endif /* LDAP_PF_INET6 */
+
+       default:
+               Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
+                       (int) (*sal)->sa_family, 0, 0 );
+               break;
        }
 
-       return tcps;
+       slap_free_listener_addresses(psal);
+
+       l.sl_url = ch_strdup( url );
+       li = ch_malloc( sizeof( Listener ) );
+       *li = l;
+
+       Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n",
+               l.sl_url, 0, 0 );
+
+       return li;
 }
 
-static void *
-slapd_daemon_task(
-       void *ptr
-)
+static int sockinit(void);
+static int sockdestroy(void);
+
+int slapd_daemon_init( const char *urls )
 {
-       int inetd;
-       struct slapd_args *args = (struct slapd_args *) ptr;
-       struct sockaddr_in *slapd_addr = args->addr;
+       int i, rc;
+       char **u;
+
+       Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
+               urls ? urls : "<null>", 0, 0 );
+
+       if( (rc = sockinit()) != 0 ) {
+               return rc;
+       }
 
-       tcps  = args->tcps;
-       free( ptr );
+#ifdef HAVE_SYSCONF
+       dtblsize = sysconf( _SC_OPEN_MAX );
+#elif HAVE_GETDTABLESIZE
+       dtblsize = getdtablesize();
+#else
+       dtblsize = FD_SETSIZE;
+#endif
 
-       inetd = ( slapd_addr == NULL);
-    if ( !daemon_initialized ) sockinit();
+#ifdef FD_SETSIZE
+       if(dtblsize > FD_SETSIZE) {
+               dtblsize = FD_SETSIZE;
+       }
+#endif /* !FD_SETSIZE */
 
-       slapd_listener=1;
+       /* open a pipe (or something equivalent connected to itself).
+        * we write a byte on this fd whenever we catch a signal. The main
+        * loop will be select'ing on this socket, and will wake up when
+        * this byte arrives.
+        */
+       if( (rc = lutil_pair( wake_sds )) < 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 );
+               return rc;
+       }
 
-       ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex );
        FD_ZERO( &slap_daemon.sd_readers );
        FD_ZERO( &slap_daemon.sd_writers );
 
-       if( !inetd ) {
-               if ( listen( tcps, 5 ) == -1 ) {
-                       int err = errno;
-                       Debug( LDAP_DEBUG_ANY,
-                               "daemon: listen(%d, 5) failed errno %d (%s)\n",
-                           tcps, err,
-                               err > -1 && err < sys_nerr
-                                       ? sys_errlist[err] : "unknown" );
-                       exit( 1 );
+       if( urls == NULL ) {
+               urls = "ldap:///";
+       }
+
+       u = str2charray( urls, " " );
+
+       if( u == NULL || u[0] == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n",
+                       urls, 0, 0 );
+
+               return -1;
+       }
+
+       for( i=0; u[i] != NULL; i++ ) {
+               Debug( LDAP_DEBUG_TRACE, "daemon_init: listen on %s\n",
+                       u[i], 0, 0 );
+       }
+
+       if( i == 0 ) {
+               Debug( LDAP_DEBUG_ANY, "daemon_init: no listeners to open (%s)\n",
+                       urls, 0, 0 );
+               charray_free( u );
+               return -1;
+       }
+
+       Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners to open...\n",
+               i, 0, 0 );
+
+       slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
+
+       for(i = 0; u[i] != NULL; i++ ) {
+               slap_listeners[i] = slap_open_listener( u[i] );
+
+               if( slap_listeners[i] == NULL ) {
+                       charray_free( u );
+                       return -1;
                }
+       }
+       slap_listeners[i] = NULL;
 
-               slapd_add( tcps );
+       Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners opened\n",
+               i, 0, 0 );
 
-       } else {
-               if( connection_init( 0, NULL, NULL ) ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "connection_init(%d) failed.\n",
-                               0, 0, 0 );
+       charray_free( u );
+       ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex );
+       return !i;
+}
+
+
+int
+slapd_daemon_destroy(void)
+{
+       connections_destroy();
+       tcp_close( wake_sds[1] );
+       tcp_close( wake_sds[0] );
+       sockdestroy();
+       return 0;
+}
 
-                       exit( 1 );
+
+static void *
+slapd_daemon_task(
+       void *ptr
+)
+{
+       int l;
+       time_t  last_idle_check = slap_get_time();
+       time( &starttime );
+
+       for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+               if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
+                       continue;
+
+               if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
+                       int err = sock_errno();
+                       Debug( LDAP_DEBUG_ANY,
+                               "daemon: listen(%s, 5) failed errno=%d (%s)\n",
+                                       slap_listeners[l]->sl_url, err,
+                                       sock_errstr(err) );
+                       return( (void*)-1 );
                }
 
-               slapd_add( 0 );
+               slapd_add( slap_listeners[l]->sl_sd );
        }
 
-#ifdef HAVE_WINSOCK
-       if ( started_event != NULL )
+#ifdef HAVE_NT_SERVICE_MANAGER
+       if ( started_event != NULL ) {
                ldap_pvt_thread_cond_signal( &started_event );
+       }
 #endif
-       // initialization complete. Here comes the loop.
+       /* initialization complete. Here comes the loop. */
+
        while ( !slapd_shutdown ) {
-               unsigned int i;
-               int ns, nfds;
+               ber_socket_t i;
+               int ns;
+               int at;
+               ber_socket_t nfds;
+#define SLAPD_EBADF_LIMIT 16
                int ebadf = 0;
-#define SLAPD_EBADF_LIMIT 10
+
+#define SLAPD_IDLE_CHECK_LIMIT 4
+               time_t  now = slap_get_time();
+
 
                fd_set                  readfds;
                fd_set                  writefds;
+               Sockaddr                from;
 
-               struct sockaddr_in      from;
-#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
+#if defined(SLAPD_RLOOKUPS)
         struct hostent         *hp;
 #endif
                struct timeval          zero;
                struct timeval          *tvp;
 
-               char    *client_name;
-               char    *client_addr;
+               if( global_idletimeout > 0 && difftime(
+                       last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
+                       now ) < 0 )
+               {
+                       connections_timeout_idle(now);
+               }
 
                FD_ZERO( &writefds );
                FD_ZERO( &readfds );
@@ -352,19 +758,26 @@ slapd_daemon_task(
 
 #ifdef FD_SET_MANUAL_COPY
                for( s = 0; s < nfds; s++ ) {
-                       if(FD_ISSET( &slap_sd_writers, s )) {
-                               FD_SET( &writefds, s );
+                       if(FD_ISSET( &slap_sd_readers, s )) {
+                               FD_SET( s, &readfds );
                        }
                        if(FD_ISSET( &slap_sd_writers, s )) {
-                               FD_SET( &writefds, s );
+                               FD_SET( s, &writefds );
                        }
                }
 #else
-               memcpy( &readfds, &slap_daemon.sd_readers, sizeof(fd_set) );
-               memcpy( &writefds, &slap_daemon.sd_writers, sizeof(fd_set) );
+               AC_MEMCPY( &readfds, &slap_daemon.sd_readers, sizeof(fd_set) );
+               AC_MEMCPY( &writefds, &slap_daemon.sd_writers, sizeof(fd_set) );
 #endif
+               assert(!FD_ISSET(wake_sds[0], &readfds));
+               FD_SET( wake_sds[0], &readfds );
 
-               FD_SET( (unsigned) tcps, &readfds );
+               for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                       if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
+                               continue;
+                       if (!FD_ISSET(slap_listeners[l]->sl_sd, &readfds))
+                           FD_SET( slap_listeners[l]->sl_sd, &readfds );
+               }
 
 #ifndef HAVE_WINSOCK
                nfds = slap_daemon.sd_nfds;
@@ -374,43 +787,52 @@ slapd_daemon_task(
 
                ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 
-               ldap_pvt_thread_mutex_lock( &active_threads_mutex );
+               at = ldap_pvt_thread_pool_backload(&connection_pool);
+
 #if defined( HAVE_YIELDING_SELECT ) || defined( NO_THREADS )
                tvp = NULL;
 #else
-               tvp = active_threads ? &zero : NULL;
+               tvp = at ? &zero : NULL;
 #endif
 
-               Debug( LDAP_DEBUG_CONNS,
-                       "daemon: select: tcps=%d active_threads=%d tvp=%s\n",
-                   tcps, active_threads,
-                       tvp == NULL ? "NULL" : "zero" );
-          
+               for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                       if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
+                               continue;
 
-               ldap_pvt_thread_mutex_unlock( &active_threads_mutex );
+                       Debug( LDAP_DEBUG_CONNS,
+                               "daemon: select: listen=%d active_threads=%d tvp=%s\n",
+                                       slap_listeners[l]->sl_sd, at,
+                                       tvp == NULL ? "NULL" : "zero" );
+               }
 
-               switch(ns = select( nfds, &readfds, &writefds, 0, tvp )) {
-               case -1: {      /* failure - try again */
+               switch(ns = select( nfds, &readfds,
 #ifdef HAVE_WINSOCK
-                               int err = WSAGetLastError();
+                       /* don't pass empty fd_set */
+                       ( writefds.fd_count > 0 ? &writefds : NULL ),
 #else
-                               int err = errno;
+                       &writefds,
 #endif
+                       NULL, tvp ))
+               {
+               case -1: {      /* failure - try again */
+                               int err = sock_errno();
 
-                               if( err == EBADF && ++ebadf < SLAPD_EBADF_LIMIT) {
-                                       continue;
+                               if( err == EBADF 
+#ifdef WSAENOTSOCK
+                                       /* you'd think this would be EBADF */
+                                       || err == WSAENOTSOCK
+#endif
+                               ) {
+                                       if (++ebadf < SLAPD_EBADF_LIMIT)
+                                               continue;
                                }
 
                                if( err != EINTR ) {
                                        Debug( LDAP_DEBUG_CONNS,
                                                "daemon: select failed (%d): %s\n",
-                                               err,
-                                               err >= 0 && err < sys_nerr
-                                                       ? sys_errlist[err] : "unknown",
-                                               0 );
-
+                                               err, sock_errstr(err), 0 );
 
-                               slapd_shutdown = -1;
+                                       slapd_shutdown = -1;
                                }
                        }
                        continue;
@@ -423,118 +845,230 @@ slapd_daemon_task(
                        continue;
 
                default:        /* something happened - deal with it */
+                       if( slapd_shutdown ) continue;
+
                        ebadf = 0;
                        Debug( LDAP_DEBUG_CONNS, "daemon: activity on %d descriptors\n",
                                ns, 0, 0 );
                        /* FALL THRU */
                }
 
-               if ( FD_ISSET( tcps, &readfds ) ) {
-                       int s;
-                       int len = sizeof(from);
-                       long id;
+               if( FD_ISSET( wake_sds[0], &readfds ) ) {
+                       char c[BUFSIZ];
+                       tcp_read( wake_sds[0], c, sizeof(c) );
+#ifdef NO_THREADS
+                       waking = 0;
+#endif
+                       continue;
+               }
 
-                       if ( (s = accept( tcps,
-                               (struct sockaddr *) &from, &len )) == -1 )
-                       {
-                               int err = errno;
-                               Debug( LDAP_DEBUG_ANY,
-                                   "daemon: accept(%d) failed errno %d (%s)\n", err,
-                                   tcps, err >= 0 && err < sys_nerr ?
-                                   sys_errlist[err] : "unknown");
-                               continue;
-                       }
+               for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                       ber_socket_t s;
+                       socklen_t len = sizeof(from);
+                       long id;
+                       slap_ssf_t ssf = 0;
+                       char *authid = NULL;
+
+                       char    *dnsname;
+                       char    *peeraddr;
+#ifdef LDAP_PF_LOCAL
+                       char    peername[MAXPATHLEN + sizeof("PATH=")];
+#elif defined(LDAP_PF_INET6)
+                       char    peername[sizeof("IP=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535")];
+#else
+                       char    peername[sizeof("IP=255.255.255.255:65336")];
+#endif /* LDAP_PF_LOCAL */
 
-#ifdef LDAP_DEBUG
-                       ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
+                       peername[0] = '\0';
 
-                       /* newly accepted stream should not be in any of the FD SETS */
+                       if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
+                               continue;
 
-                       assert( !FD_ISSET( s, &slap_daemon.sd_actives) );
-                       assert( !FD_ISSET( s, &slap_daemon.sd_readers) );
-                       assert( !FD_ISSET( s, &slap_daemon.sd_writers) );
+                       if ( !FD_ISSET( slap_listeners[l]->sl_sd, &readfds ) )
+                               continue;
 
-                       ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-#endif
+                       s = accept( slap_listeners[l]->sl_sd,
+                               (struct sockaddr *) &from, &len );
+                       if ( s == AC_SOCKET_INVALID ) {
+                               int err = sock_errno();
+                               Debug( LDAP_DEBUG_ANY,
+                                   "daemon: accept(%ld) failed errno=%d (%s)\n",
+                                   (long) slap_listeners[l]->sl_sd, err,
+                                   sock_errstr(err) );
+                               continue;
+                       }
 
 #ifndef HAVE_WINSOCK
                        /* make sure descriptor number isn't too great */
                        if ( s >= dtblsize ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "daemon: %d beyond descriptor table size %d\n",
-                                       s, dtblsize, 0 );
+                                       "daemon: %ld beyond descriptor table size %ld\n",
+                                       (long) s, (long) dtblsize, 0 );
                                slapd_close(s);
                                continue;
                        }
 #endif
-                  
-                       Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %d\n",
-                               s, 0, 0 );
-
-                       len = sizeof(from);
-                       if ( getpeername( s, (struct sockaddr *) &from, &len ) == 0 ) {
-                               client_addr = inet_ntoa( from.sin_addr );
 
-#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
-                               hp = gethostbyaddr( (char *)
-                                   &(from.sin_addr.s_addr),
-                                   sizeof(from.sin_addr.s_addr), AF_INET );
+#ifdef LDAP_DEBUG
+                       ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
-                               if(hp) {
-                                       char *p;
-                                       client_name = hp->h_name;
+                       /* newly accepted stream should not be in any of the FD SETS */
+                       assert( !FD_ISSET( s, &slap_daemon.sd_actives) );
+                       assert( !FD_ISSET( s, &slap_daemon.sd_readers) );
+                       assert( !FD_ISSET( s, &slap_daemon.sd_writers) );
 
-                                       /* normalize the domain */
-                                       for ( p = client_name; *p; p++ ) {
-                                               *p = TOLOWER( (unsigned char) *p );
-                                       }
+                       ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
+#endif
 
-                               } else {
-                                       client_name = NULL;
+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
+#ifdef LDAP_PF_LOCAL
+                       /* for IPv4 and IPv6 sockets only */
+                       if ( from.sa_addr.sa_family != AF_LOCAL )
+#endif /* LDAP_PF_LOCAL */
+                       {
+                               int rc;
+                               int tmp;
+#ifdef SO_KEEPALIVE
+                               /* enable keep alives */
+                               tmp = 1;
+                               rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
+                                       (char *) &tmp, sizeof(tmp) );
+                               if ( rc == AC_SOCKET_ERROR ) {
+                                       int err = sock_errno();
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
+                                               "errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
                                }
-#else
-                               client_name = NULL;
+#endif
+#ifdef TCP_NODELAY
+                               /* enable no delay */
+                               tmp = 1;
+                               rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
+                                       (char *)&tmp, sizeof(tmp) );
+                               if ( rc == AC_SOCKET_ERROR ) {
+                                       int err = sock_errno();
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "slapd(%ld): setsockopt(TCP_NODELAY) failed "
+                                               "errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
+                               }
+#endif
+                       }
 #endif
 
+                       Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
+                               (long) s, 0, 0 );
+
+                       switch ( from.sa_addr.sa_family ) {
+#  ifdef LDAP_PF_LOCAL
+                       case AF_LOCAL:
+                               sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path );
+                               ssf = LDAP_PVT_SASL_LOCAL_SSF;
+                               break;
+#endif /* LDAP_PF_LOCAL */
+
+#  ifdef LDAP_PF_INET6
+                       case AF_INET6:
+                       if ( IN6_IS_ADDR_V4MAPPED(&from.sa_in6_addr.sin6_addr) ) {
+                               peeraddr = inet_ntoa( *((struct in_addr *)
+                                                       &from.sa_in6_addr.sin6_addr.s6_addr[12]) );
+                               sprintf( peername, "IP=%s:%d",
+                                        peeraddr != NULL ? peeraddr : "unknown",
+                                        (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
                        } else {
-                               client_name = NULL;;
-                               client_addr = NULL;
+                               char addr[INET6_ADDRSTRLEN];
+                               sprintf( peername, "IP=%s %d",
+                                        inet_ntop( AF_INET6,
+                                                   &from.sa_in6_addr.sin6_addr,
+                                                   addr, sizeof addr) ? addr : "unknown",
+                                        (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
                        }
+                       break;
+#  endif /* LDAP_PF_INET6 */
 
-#ifdef HAVE_TCPD
-                       if(!hosts_ctl("slapd",
-                               client_name != NULL ? client_name : STRING_UNKNOWN,
-                               client_addr != NULL ? client_addr : STRING_UNKNOWN,
-                               STRING_UNKNOWN))
-                       {
-                               /* DENY ACCESS */
-                               Statslog( LDAP_DEBUG_ANY,
-                                "fd=%d connection from %s (%s) denied.\n",
-                                       s,
-                                       client_name == NULL ? "unknown" : client_name,
-                                       client_addr == NULL ? "unknown" : client_addr,
-                                 0, 0 );
+                       case AF_INET:
+                       peeraddr = inet_ntoa( from.sa_in_addr.sin_addr );
+                       sprintf( peername, "IP=%s:%d",
+                               peeraddr != NULL ? peeraddr : "unknown",
+                               (unsigned) ntohs( from.sa_in_addr.sin_port ) );
+                               break;
 
+                       default:
                                slapd_close(s);
                                continue;
                        }
+
+                       if ( ( from.sa_addr.sa_family == AF_INET ) 
+#ifdef LDAP_PF_INET6
+                               || ( from.sa_addr.sa_family == AF_INET6 )
+#endif
+                       ) {
+#ifdef SLAPD_RLOOKUPS
+#  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;
+#else
+                               dnsname = NULL;
+#endif /* SLAPD_RLOOKUPS */
+
+#ifdef HAVE_TCPD
+                               if ( !hosts_ctl("slapd",
+                                               dnsname != NULL ? dnsname : STRING_UNKNOWN,
+                                               peeraddr != NULL ? peeraddr : STRING_UNKNOWN,
+                                               STRING_UNKNOWN ))
+                               {
+                                       /* DENY ACCESS */
+                                       Statslog( LDAP_DEBUG_ANY,
+                                               "fd=%ld host access from %s (%s) denied.\n",
+                                               (long) s,
+                                               dnsname != NULL ? dnsname : "unknown",
+                                               peeraddr != NULL ? peeraddr : "unknown",
+                                               0, 0 );
+                                       slapd_close(s);
+                                       continue;
+                               }
 #endif /* HAVE_TCPD */
+                       }
 
-                       if( (id = connection_init(s, client_name, client_addr)) < 0 ) {
+                       id = connection_init(s,
+                               slap_listeners[l]->sl_url,
+                               dnsname != NULL ? dnsname : "unknown",
+                               peername,
+                               slap_listeners[l]->sl_name,
+#ifdef HAVE_TLS
+                               slap_listeners[l]->sl_is_tls,
+#else
+                               0,
+#endif
+                               ssf,
+                               authid );
+
+                       if( authid ) ch_free(authid);
+
+                       if( id < 0 ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "daemon: connection_init(%d, %s, %s) failed.\n",
-                                       s,
-                                       client_name == NULL ? "unknown" : client_name,
-                                       client_addr == NULL ? "unknown" : client_addr);
+                                       "daemon: connection_init(%ld, %s, %s) failed.\n",
+                                       (long) s,
+                                       peername,
+                                       slap_listeners[l]->sl_name );
                                slapd_close(s);
                                continue;
                        }
 
                        Statslog( LDAP_DEBUG_STATS,
-                               "daemon: conn=%d fd=%d connection from %s (%s) accepted.\n",
-                               id, s,
-                               client_name == NULL ? "unknown" : client_name,
-                               client_addr == NULL ? "unknown" : client_addr,
+                               "daemon: conn=%ld fd=%ld connection from %s (%s) accepted.\n",
+                               id, (long) s,
+                               peername,
+                               slap_listeners[l]->sl_name,
                                0 );
 
                        slapd_add( s );
@@ -545,18 +1079,30 @@ slapd_daemon_task(
                Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 );
 #ifdef HAVE_WINSOCK
                for ( i = 0; i < readfds.fd_count; i++ ) {
-                       Debug( LDAP_DEBUG_CONNS, " %d%s", readfds.fd_array[i], "r" );
+                       Debug( LDAP_DEBUG_CONNS, " %d%s",
+                               readfds.fd_array[i], "r", 0 );
                }
                for ( i = 0; i < writefds.fd_count; i++ ) {
-                       Debug( LDAP_DEBUG_CONNS, " %d%s", writefds.fd_array[i], "w" );
+                       Debug( LDAP_DEBUG_CONNS, " %d%s",
+                               writefds.fd_array[i], "w", 0 );
                }
 #else
                for ( i = 0; i < nfds; i++ ) {
-                       int     a, r, w;
+                       int     r, w;
+                       int     is_listener = 0;
 
+                       for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                               if ( i == slap_listeners[l]->sl_sd ) {
+                                       is_listener = 1;
+                                       break;
+                               }
+                       }
+                       if ( is_listener ) {
+                               continue;
+                       }
                        r = FD_ISSET( i, &readfds );
                        w = FD_ISSET( i, &writefds );
-                       if ( i != tcps && (r || w) ) {
+                       if ( r || w ) {
                                Debug( LDAP_DEBUG_CONNS, " %d%s%s", i,
                                    r ? "r" : "", w ? "w" : "" );
                        }
@@ -572,8 +1118,8 @@ slapd_daemon_task(
                for ( i = 0; i < nfds; i++ )
 #endif
                {
-                       int wd;
-
+                       ber_socket_t wd;
+                       int is_listener = 0;
 #ifdef HAVE_WINSOCK
                        wd = writefds.fd_array[i];
 #else
@@ -583,7 +1129,13 @@ slapd_daemon_task(
                        wd = i;
 #endif
 
-                       if ( wd == tcps ) {
+                       for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                               if ( i == slap_listeners[l]->sl_sd ) {
+                                       is_listener = 1;
+                                       break;
+                               }
+                       }
+                       if ( is_listener ) {
                                continue;
                        }
                        Debug( LDAP_DEBUG_CONNS,
@@ -609,7 +1161,8 @@ slapd_daemon_task(
                for ( i = 0; i < nfds; i++ )
 #endif
                {
-                       int rd;
+                       ber_socket_t rd;
+                       int is_listener = 0;
 
 #ifdef HAVE_WINSOCK
                        rd = readfds.fd_array[i];
@@ -620,7 +1173,13 @@ slapd_daemon_task(
                        rd = i;
 #endif
 
-                       if ( rd == tcps ) {
+                       for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+                               if ( rd == slap_listeners[l]->sl_sd ) {
+                                       is_listener = 1;
+                                       break;
+                               }
+                       }
+                       if ( is_listener ) {
                                continue;
                        }
 
@@ -647,6 +1206,13 @@ slapd_daemon_task(
                        0, 0, 0 );
 
        } else if ( slapd_shutdown < 0 ) {
+#ifdef HAVE_NT_SERVICE_MANAGER
+               if (slapd_shutdown == -1)
+                   Debug( LDAP_DEBUG_TRACE,
+                         "daemon: shutdown initiated by Service Manager.\n",
+                         0, 0, 0);
+               else
+#endif
                Debug( LDAP_DEBUG_TRACE,
                        "daemon: abnormal condition, shutdown initiated.\n",
                        0, 0, 0 );
@@ -656,67 +1222,64 @@ slapd_daemon_task(
                        0, 0, 0 );
        }
 
-       if( tcps >= 0 ) {
-               slapd_close( tcps );
+       for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+               if ( slap_listeners[l]->sl_sd != AC_SOCKET_INVALID ) {
+#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 );
+                       }
+#endif /* LDAP_PF_LOCAL */
+                       slapd_close( slap_listeners[l]->sl_sd );
+                       break;
+               }
        }
 
-       ldap_pvt_thread_mutex_lock( &active_threads_mutex );
        Debug( LDAP_DEBUG_ANY,
            "slapd shutdown: waiting for %d threads to terminate\n",
-           active_threads, 0, 0 );
-       while ( active_threads > 0 ) {
-               ldap_pvt_thread_cond_wait(&active_threads_cond, &active_threads_mutex);
-       }
-       ldap_pvt_thread_mutex_unlock( &active_threads_mutex );
+           ldap_pvt_thread_pool_backload(&connection_pool), 0, 0 );
+
+       ldap_pvt_thread_pool_destroy(&connection_pool, 1);
 
        return NULL;
 }
 
 
-int slapd_daemon( struct slapd_args *args )
+int slapd_daemon( void )
 {
        int rc;
 
-    if ( !daemon_initialized ) sockinit();
-
        connections_init();
 
 #define SLAPD_LISTENER_THREAD 1
-#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
+#if defined( SLAPD_LISTENER_THREAD )
+       {
+               ldap_pvt_thread_t       listener_tid;
 
-       /* listener as a separate THREAD */
-       rc = ldap_pvt_thread_create( &listener_tid,
-               0, slapd_daemon_task, args );
+               /* listener as a separate THREAD */
+               rc = ldap_pvt_thread_create( &listener_tid,
+                       0, slapd_daemon_task, NULL );
 
-       if ( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                   "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-               goto destory;
-       }
+               if ( rc != 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                       "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
+                       return rc;
+               }
 
-       /* wait for the listener thread to complete */
-       ldap_pvt_thread_join( listener_tid, (void *) NULL );
+               /* wait for the listener thread to complete */
+               ldap_pvt_thread_join( listener_tid, (void *) NULL );
+       }
 #else
-       /* expermimental code */
-       listener_tid = pthread_self();
-       slapd_daemon_task( args );
+       /* experimental code */
+       slapd_daemon_task( NULL );
 #endif
 
-       rc = 0;
-
-destory:
-       connections_destroy();
+       return 0;
 
-#ifdef HAVE_WINSOCK
-    WSACleanup( );
-#endif
-
-       return rc;
 }
 
-#ifdef HAVE_WINSOCK2
-void sockinit()
+int sockinit(void)
 {
+#if defined( HAVE_WINSOCK2 )
     WORD wVersionRequested;
        WSADATA wsaData;
        int err;
@@ -727,7 +1290,7 @@ void sockinit()
        if ( err != 0 ) {
                /* Tell the user that we couldn't find a usable */
                /* WinSock DLL.                                  */
-               return;
+               return -1;
        }
  
        /* Confirm that the WinSock DLL supports 2.0.*/
@@ -741,77 +1304,63 @@ void sockinit()
        {
            /* Tell the user that we couldn't find a usable */
            /* WinSock DLL.                                  */
-           WSACleanup( );
-           return; 
-       }
-    daemon_initialized = 1;
-}      /* The WinSock DLL is acceptable. Proceed. */
-
-void hit_socket()
-{
-       int s, on = 1;
-       extern struct sockaddr_in       bind_addr;
-
-       /* throw something at the socket to terminate the select() in the daemon thread. */
-       if (( s = socket( AF_INET, SOCK_STREAM, 0 )) == INVALID_SOCKET )
-               Debug( LDAP_DEBUG_ANY,
-                       "slap_set_shutdown: socket failed\n\tWSAGetLastError=%d (%s)\n",
-                       WSAGetLastError(), WSAGetLastErrorString(), 0 );
-
-       if ( ioctlsocket( s, FIONBIO, &on ) == -1 ) 
-               Debug( LDAP_DEBUG_ANY,
-                       "slap_set_shutdown:FIONBIO ioctl on %d faled\n\tWSAGetLastError=%d (%s)\n",
-                       s, WSAGetLastError(), WSAGetLastError() );
-       
-       bind_addr.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
-
-       if ( connect( s, (struct sockaddr *)&bind_addr, sizeof( struct sockaddr_in )) == SOCKET_ERROR ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "hit_socket: error on connect: %d\n", WSAGetLastError(), 0 );
-               /* we can probably expect some error to occur here, mostly WSAEWOULDBLOCK */
+           WSACleanup();
+           return -1; 
        }
 
-       tcp_close(s);
-}
-
-#elif HAVE_WINSOCK
-void sockinit()
-{      WSADATA wsaData;
+       /* The WinSock DLL is acceptable. Proceed. */
+#elif defined( HAVE_WINSOCK )
+       WSADATA wsaData;
        if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
-           return( NULL );
+           return -1;
        }
-    daemon_initialized = 1;
+#endif
+       return 0;
 }
-#else
-void sockinit()
+
+int sockdestroy(void)
 {
-    daemon_initialized = 1;
-    return;
-}
+#if defined( HAVE_WINSOCK2 ) || defined( HAVE_WINSOCK )
+       WSACleanup();
 #endif
+       return 0;
+}
 
-void
-slap_set_shutdown( int sig )
+RETSIGTYPE
+slap_sig_shutdown( int sig )
 {
-       slapd_shutdown = sig;
-#ifndef HAVE_WINSOCK
-       if(slapd_listener) {
-               ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
-       }
-#else
-       Debug( LDAP_DEBUG_TRACE, "Shutdown %d ordered", sig, 0 );
-       // trying to "hit" the socket seems to always get a
-       // EWOULDBLOCK error, so just close the listen socket to
-       // break out of the select since we're shutting down anyway
-       tcp_close( tcps );
+       Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0);
+
+       /*
+        * If the NT Service Manager is controlling the server, we don't
+        * want SIGBREAK to kill the server. For some strange reason,
+        * SIGBREAK is generated when a user logs out.
+        */
+
+#if HAVE_NT_SERVICE_MANAGER && SIGBREAK
+       if (is_NT_Service && sig == SIGBREAK)
+           Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
+                 0, 0, 0);
+       else
 #endif
+       slapd_shutdown = sig;
+
+       WAKE_LISTENER(1);
+
        /* reinstall self */
-       (void) SIGNAL( sig, slap_set_shutdown );
+       (void) SIGNAL_REINSTALL( sig, slap_sig_shutdown );
 }
 
-void
-slap_do_nothing( int sig )
+RETSIGTYPE
+slap_sig_wake( int sig )
 {
+       WAKE_LISTENER(1);
+
        /* reinstall self */
-       (void) SIGNAL( sig, slap_do_nothing );
+       (void) SIGNAL_REINSTALL( sig, slap_sig_wake );
+}
+
+
+void slapd_add_internal(ber_socket_t s) {
+       slapd_add(s);
 }