]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/daemon.c
add new ber dump routine (behind NEW_LOGGING)
[openldap] / servers / slapd / daemon.c
index bcae0d3fb6c5b91a145a7d68a1791428af0d5ffb..c9eb693cdcf880cb4a0ffcbbdb43b66025f7fd9c 100644 (file)
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -27,10 +27,25 @@ 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 */
 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;
+
 typedef struct slap_listener {
        char* sl_url;
        char* sl_name;
@@ -38,11 +53,14 @@ typedef struct slap_listener {
        int             sl_is_tls;
 #endif
        ber_socket_t            sl_sd;
-       struct sockaddr_in      sl_addr;
+       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
@@ -57,6 +75,7 @@ do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
 #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
@@ -64,8 +83,6 @@ static
 #endif
 volatile sig_atomic_t slapd_shutdown = 0;
 
-static ldap_pvt_thread_t       listener_tid;
-
 static struct slap_daemon {
        ldap_pvt_thread_mutex_t sd_mutex;
 
@@ -176,15 +193,190 @@ static void slapd_close(ber_socket_t s) {
        tcp_close(s);
 }
 
+static void slap_free_listener_addresses(struct sockaddr **sal)
+{
+       struct sockaddr **sap;
+
+       if (sal == NULL) {
+               return;
+       }
+
+       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)
+{
+       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);
+
+#else
+#  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
+
+       *sap = NULL;
+       return 0;
+
+errexit:
+       slap_free_listener_addresses(*sal);
+       return -1;
+}
 
-static Listener * open_listener( const char* url )
+static Listener * slap_open_listener(
+       const char* url )
 {
        int     tmp, rc;
        Listener l;
        Listener *li;
        LDAPURLDesc *lud;
-       char *s;
-       int port;
+       unsigned short port;
+       int err, addrlen;
+       struct sockaddr **sal, **psal;
 
        rc = ldap_url_parse( url, &lud );
 
@@ -196,7 +388,7 @@ static Listener * open_listener( const char* url )
        }
 
 #ifndef HAVE_TLS
-       if( lud->lud_ldaps ) {
+       if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "daemon: TLS not supported (%s)\n",
                        url, 0, 0 );
@@ -209,115 +401,180 @@ static Listener * open_listener( const char* url )
        }
 
 #else
-       l.sl_is_tls = lud->lud_ldaps;
+       l.sl_is_tls = ldap_pvt_url_scheme2tls( lud->lud_scheme );
 
        if(! lud->lud_port ) {
-               lud->lud_port = lud->lud_ldaps ? LDAPS_PORT : LDAP_PORT;
+               lud->lud_port = l.sl_is_tls ? LDAPS_PORT : LDAP_PORT;
        }
 #endif
 
-       port = lud->lud_port;
-
-       (void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
-
-       l.sl_addr.sin_family = AF_INET;
-       l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
-
-       if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
-               || strcmp(lud->lud_host, "*") == 0 )
-       {
-               l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
+       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
        } else {
-               /* host or address was specified */
-               if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
-                       struct hostent *he = gethostbyname( lud->lud_host );
-                       if( he == NULL ) {
-                               Debug( LDAP_DEBUG_ANY, "invalid host (%s) in URL: %s",
-                                       lud->lud_host, url, 0);
-                               ldap_free_urldesc( lud );
-                               return NULL;
-                       }
-
-                       memcpy( &l.sl_addr.sin_addr, he->h_addr,
-                              sizeof( l.sl_addr.sin_addr ) );
+               if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
+                       || strcmp(lud->lud_host, "*") == 0 )
+               {
+                       err = slap_get_listener_addresses(NULL, port, &sal);
+               } else {
+                       err = slap_get_listener_addresses(lud->lud_host, port, &sal);
                }
        }
 
        ldap_free_urldesc( lud );
-
-
-       if ( (l.sl_sd = socket( AF_INET, SOCK_STREAM, 0 )) == AC_SOCKET_INVALID ) {
-               int err = sock_errno();
-               Debug( LDAP_DEBUG_ANY,
-                       "daemon: socket() failed errno=%d (%s)\n", err,
-                       sock_errstr(err), 0 );
+       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,
+                               "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 );
-               return NULL;
-       }
+               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 LDAP_PF_LOCAL
+               if ( (*sal)->sa_family == AF_LOCAL ) {
+                       unlink ( ((struct sockaddr_un *)*sal)->sun_path );
+               } else
+#endif
+               {
 #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) );
-       }
+                       /* 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
-#ifdef SO_KEEPALIVE
-       /* enable keep alives */
-       tmp = 1;
-       rc = setsockopt( l.sl_sd, 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) l.sl_sd, err, sock_errstr(err) );
-       }
+               }
+       
+               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 TCP_NODELAY
-       /* enable no delay */
-       tmp = 1;
-       rc = setsockopt( l.sl_sd, 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) l.sl_sd, err, sock_errstr(err) );
-       }
+#ifdef LDAP_PF_LOCAL
+               case AF_LOCAL:
+                       addrlen = sizeof(struct sockaddr_un);
+                       break;
 #endif
-
-       rc = bind( l.sl_sd, (struct sockaddr *) &l.sl_addr, sizeof(l.sl_addr) );
-       if ( rc == AC_SOCKET_ERROR ) {
-               int err = sock_errno();
+               }
+       
+               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) );
+                      (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;
        }
 
-       l.sl_url = ch_strdup( url );
+       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;
+       }
 
-       l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
-       s = inet_ntoa( l.sl_addr.sin_addr );
-       sprintf( l.sl_name, "IP=%s:%d",
-               s != NULL ? s : "unknown" , port );
+       slap_free_listener_addresses(psal);
 
+       l.sl_url = ch_strdup( url );
        li = ch_malloc( sizeof( Listener ) );
        *li = l;
 
@@ -330,15 +587,11 @@ static Listener * open_listener( const char* url )
 static int sockinit(void);
 static int sockdestroy(void);
 
-int slapd_daemon_init( char *urls )
+int slapd_daemon_init( const char *urls )
 {
        int i, rc;
        char **u;
 
-#ifndef HAVE_TLS
-       assert( tls_port == 0 );
-#endif
-
        Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
                urls ? urls : "<null>", 0, 0 );
 
@@ -405,7 +658,7 @@ int slapd_daemon_init( char *urls )
        slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
 
        for(i = 0; u[i] != NULL; i++ ) {
-               slap_listeners[i] = open_listener( u[i] );
+               slap_listeners[i] = slap_open_listener( u[i] );
 
                if( slap_listeners[i] == NULL ) {
                        charray_free( u );
@@ -447,7 +700,7 @@ slapd_daemon_task(
                if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
                        continue;
 
-               if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
+               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",
@@ -471,7 +724,7 @@ slapd_daemon_task(
                int ns;
                int at;
                ber_socket_t nfds;
-#define SLAPD_EBADF_LIMIT 10
+#define SLAPD_EBADF_LIMIT 16
                int ebadf = 0;
 
 #define SLAPD_IDLE_CHECK_LIMIT 4
@@ -480,9 +733,9 @@ slapd_daemon_task(
 
                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;
@@ -513,8 +766,8 @@ slapd_daemon_task(
                        }
                }
 #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 );
@@ -534,9 +787,7 @@ slapd_daemon_task(
 
                ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 
-               ldap_pvt_thread_mutex_lock( &active_threads_mutex );
-               at = active_threads;
-               ldap_pvt_thread_mutex_unlock( &active_threads_mutex );
+               at = ldap_pvt_thread_pool_backload(&connection_pool);
 
 #if defined( HAVE_YIELDING_SELECT ) || defined( NO_THREADS )
                tvp = NULL;
@@ -567,8 +818,9 @@ slapd_daemon_task(
                                int err = sock_errno();
 
                                if( err == EBADF 
-#ifdef HAVE_WINSOCK
-                                       || err == WSAENOTSOCK   /* you'd think this would be EBADF */
+#ifdef WSAENOTSOCK
+                                       /* you'd think this would be EBADF */
+                                       || err == WSAENOTSOCK
 #endif
                                ) {
                                        if (++ebadf < SLAPD_EBADF_LIMIT)
@@ -593,6 +845,8 @@ 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 );
@@ -609,14 +863,23 @@ slapd_daemon_task(
                }
 
                for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-                       ber_int_t s;
+                       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 */
+
+                       peername[0] = '\0';
 
                        if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
                                continue;
@@ -624,9 +887,9 @@ slapd_daemon_task(
                        if ( !FD_ISSET( slap_listeners[l]->sl_sd, &readfds ) )
                                continue;
 
-                       if ( (s = accept( slap_listeners[l]->sl_sd,
-                               (struct sockaddr *) &from, &len )) == AC_SOCKET_INVALID )
-                       {
+                       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",
@@ -635,11 +898,21 @@ slapd_daemon_task(
                                continue;
                        }
 
+#ifndef HAVE_WINSOCK
+                       /* make sure descriptor number isn't too great */
+                       if ( s >= dtblsize ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "daemon: %ld beyond descriptor table size %ld\n",
+                                       (long) s, (long) dtblsize, 0 );
+                               slapd_close(s);
+                               continue;
+                       }
+#endif
+
 #ifdef LDAP_DEBUG
                        ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
                        /* 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) );
@@ -647,82 +920,141 @@ slapd_daemon_task(
                        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
 #endif
 
-#ifndef HAVE_WINSOCK
-                       /* make sure descriptor number isn't too great */
-                       if ( s >= dtblsize ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "daemon: %ld beyond descriptor table size %ld\n",
-                                       (long) s, (long) dtblsize, 0 );
-                               slapd_close(s);
-                               continue;
+#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) );
+                               }
+#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 );
 
-                       len = sizeof(from);
-
-                       if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
-                               int err = sock_errno();
-                               Debug( LDAP_DEBUG_ANY,
-                                       "daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
-                                       (long) s, err, sock_errstr(err) );
-                               slapd_close(s);
-                               continue;
+                       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 {
+                               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 */
 
-                       peeraddr = inet_ntoa( from.sin_addr );
+                       case AF_INET:
+                       peeraddr = inet_ntoa( from.sa_in_addr.sin_addr );
                        sprintf( peername, "IP=%s:%d",
                                peeraddr != NULL ? peeraddr : "unknown",
-                               (unsigned) ntohs( from.sin_port ) );
-
-#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
-                       hp = gethostbyaddr( (char *)
-                           &(from.sin_addr),
-                           sizeof(from.sin_addr), AF_INET );
+                               (unsigned) ntohs( from.sa_in_addr.sin_port ) );
+                               break;
 
-                       if(hp) {
-                               dnsname = ldap_pvt_str2lower( hp->h_name );
-
-                       } else {
-                               dnsname = NULL;
+                       default:
+                               slapd_close(s);
+                               continue;
                        }
-#else
-                       dnsname = NULL;
+
+                       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 connection from %s (%s) denied.\n",
-                                       (long) s,
-                                       dnsname != NULL ? dnsname : "unknown",
-                                       peeraddr != NULL ? peeraddr : "unknown",
-                                 0, 0 );
-
-                               slapd_close(s);
-                               continue;
-                       }
+                               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,
+                       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
+                               slap_listeners[l]->sl_is_tls,
 #else
-                               0
+                               0,
 #endif
-                               )) < 0 )
-                       {
+                               ssf,
+                               authid );
+
+                       if( authid ) ch_free(authid);
+
+                       if( id < 0 ) {
                                Debug( LDAP_DEBUG_ANY,
                                        "daemon: connection_init(%ld, %s, %s) failed.\n",
                                        (long) s,
@@ -874,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 );
@@ -885,19 +1224,21 @@ slapd_daemon_task(
 
        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;
 }
@@ -910,23 +1251,25 @@ int slapd_daemon( void )
        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, NULL );
+               /* 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 );
-               return rc;
-       }
+               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();
+       /* experimental code */
        slapd_daemon_task( NULL );
 #endif
 
@@ -934,9 +1277,9 @@ int slapd_daemon( void )
 
 }
 
-#ifdef HAVE_WINSOCK2
 int sockinit(void)
 {
+#if defined( HAVE_WINSOCK2 )
     WORD wVersionRequested;
        WSADATA wsaData;
        int err;
@@ -966,49 +1309,46 @@ int sockinit(void)
        }
 
        /* The WinSock DLL is acceptable. Proceed. */
-       return 0;
-}
-
-int sockdestroy(void)
-{
-       WSACleanup();
-       return 0;
-}
-
-#elif HAVE_WINSOCK
-static int sockinit(void)
-{
+#elif defined( HAVE_WINSOCK )
        WSADATA wsaData;
        if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
            return -1;
        }
-       return 0;
-}
-static int sockdestroy(void)
-{
-       WSACleanup();
+#endif
        return 0;
 }
 
-#else
-static int sockinit(void)
-{
-       return 0;
-}
-static int sockdestroy(void)
+int sockdestroy(void)
 {
+#if defined( HAVE_WINSOCK2 ) || defined( HAVE_WINSOCK )
+       WSACleanup();
+#endif
        return 0;
 }
-#endif
 
 RETSIGTYPE
 slap_sig_shutdown( int sig )
 {
+       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_sig_shutdown );
+       (void) SIGNAL_REINSTALL( sig, slap_sig_shutdown );
 }
 
 RETSIGTYPE
@@ -1017,5 +1357,10 @@ slap_sig_wake( int sig )
        WAKE_LISTENER(1);
 
        /* reinstall self */
-       (void) SIGNAL( sig, slap_sig_wake );
+       (void) SIGNAL_REINSTALL( sig, slap_sig_wake );
+}
+
+
+void slapd_add_internal(ber_socket_t s) {
+       slapd_add(s);
 }