X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=fad697b1dd9f078561a578e3fbe543b1eba787b3;hb=1fbbc1181152a32c1b9b82342ad6d63034ec7fbb;hp=137734c104b8d3a3d2fb8557cd4d137c911d21e1;hpb=b89c4539b9865414a51ba4c504cb535a7279df2e;p=openldap diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 137734c104..fad697b1dd 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -22,10 +22,13 @@ #ifdef HAVE_TCPD #include +#define SLAP_STRING_UNKNOWN STRING_UNKNOWN int allow_severity = LOG_INFO; int deny_severity = LOG_NOTICE; -#endif /* TCP Wrappers */ +#else /* ! TCP Wrappers */ +#define SLAP_STRING_UNKNOWN "unknown" +#endif /* ! TCP Wrappers */ #ifdef LDAP_PF_LOCAL #include @@ -33,6 +36,12 @@ int deny_severity = LOG_NOTICE; #define LDAPI_MOD_URLEXT "x-mod" #endif /* LDAP_PF_LOCAL */ +#ifdef LDAP_PF_INET6 +int slap_inet4or6 = AF_UNSPEC; +#else +int slap_inet4or6 = AF_INET; +#endif + /* globals */ time_t starttime; ber_socket_t dtblsize; @@ -43,7 +52,7 @@ Listener **slap_listeners = NULL; static ber_socket_t wake_sds[2]; -#ifdef NO_THREADS +#if defined(NO_THREADS) || defined(HAVE_GNU_PTH) static int waking; #define WAKE_LISTENER(w) \ ((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0) @@ -89,7 +98,7 @@ static SLPHandle slapd_hslp = 0; void slapd_slp_init( const char* urls ) { int i; - slapd_srvurls = str2charray( urls, " " ); + slapd_srvurls = ldap_str2charray( urls, " " ); if( slapd_srvurls == NULL ) return; @@ -101,7 +110,7 @@ void slapd_slp_init( const char* urls ) { slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAP_SRVTYPE_PREFIX ) ); - strcpy( slap_strcopy(slapd_srvurls[i], + strcpy( lutil_strcopy(slapd_srvurls[i], LDAP_SRVTYPE_PREFIX ), host ); ch_free( host ); @@ -113,7 +122,7 @@ void slapd_slp_init( const char* urls ) { slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAPS_SRVTYPE_PREFIX ) ); - strcpy( slap_strcopy(slapd_srvurls[i], + strcpy( lutil_strcopy(slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX ), host ); ch_free( host ); @@ -128,7 +137,7 @@ void slapd_slp_init( const char* urls ) { void slapd_slp_deinit() { if( slapd_srvurls == NULL ) return; - charray_free( slapd_srvurls ); + ldap_charray_free( slapd_srvurls ); slapd_srvurls = NULL; /* close the SLP handle */ @@ -198,11 +207,10 @@ static void slapd_add(ber_socket_t s) { FD_SET( s, &slap_daemon.sd_readers ); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slapd_add: added %ld%s%s\n", - (long)s, - FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "", - FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" )); + LDAP_LOG( CONNECTION, DETAIL1, + "slapd_add: added %ld%s%s\n", (long)s, + FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "", + FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ); #else Debug( LDAP_DEBUG_CONNS, "daemon: added %ld%s%s\n", (long) s, @@ -221,11 +229,10 @@ void slapd_remove(ber_socket_t s, int wake) { slap_daemon.sd_nactives--; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slapd_remove: removing %ld%s%s\n", - (long) s, - FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "", - FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" )); + LDAP_LOG( CONNECTION, DETAIL1, + "slapd_remove: removing %ld%s%s\n", (long) s, + FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "", + FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ); #else Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n", (long) s, @@ -237,7 +244,7 @@ void slapd_remove(ber_socket_t s, int wake) { FD_CLR( s, &slap_daemon.sd_writers ); ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); - WAKE_LISTENER(wake || slapd_gentle_shutdown < 0); + WAKE_LISTENER(wake || slapd_gentle_shutdown == 2); } void slapd_clr_write(ber_socket_t s, int wake) { @@ -284,8 +291,7 @@ void slapd_set_read(ber_socket_t s, int wake) { static void slapd_close(ber_socket_t s) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slapd_close: closing %ld\n", (long)s )); + LDAP_LOG( CONNECTION, DETAIL1, "slapd_close: closing %ld\n", (long)s, 0, 0); #else Debug( LDAP_DEBUG_CONNS, "daemon: closing %ld\n", (long) s, 0, 0 ); @@ -308,7 +314,7 @@ static void slap_free_listener_addresses(struct sockaddr **sal) ch_free(sal); } -#ifdef LDAP_PF_LOCAL +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) static int get_url_perms( char **exts, mode_t *perms, @@ -331,27 +337,53 @@ static int get_url_perms( } if ( strncasecmp( type, LDAPI_MOD_URLEXT "=", sizeof(LDAPI_MOD_URLEXT "=") - 1 ) == 0 ) { - char *value = type + sizeof(LDAPI_MOD_URLEXT "=") - 1; + char *value = type + + ( sizeof(LDAPI_MOD_URLEXT "=") - 1 ); mode_t p = 0; int j; - if ( strlen(value) != 3 ) { - return LDAP_OTHER; - } + switch (strlen(value)) { + case 4: + /* skip leading '0' */ + if ( value[ 0 ] != '0' ) { + return LDAP_OTHER; + } + value++; - for ( j = 0; j < 3; j++ ) { - static mode_t m[ 3 ] - = { S_IRWXU, S_IRWXG, S_IRWXO }; + case 3: + for ( j = 0; j < 3; j++) { + int v; - switch ( value[ j ] ) { - case 'w': - p |= m[ j ]; - break; - case '-': - break; - default: - return LDAP_OTHER; + v = value[ j ] - '0'; + + if ( v < 0 || v > 7 ) { + return LDAP_OTHER; + } + + p |= v << 3*(2-j); } + break; + + case 10: + for ( j = 1; j < 10; j++ ) { + static mode_t m[] = { 0, + S_IRUSR, S_IWUSR, S_IXUSR, + S_IRGRP, S_IWGRP, S_IXGRP, + S_IROTH, S_IWOTH, S_IXOTH + }; + static char c[] = "-rwxrwxrwx"; + + if ( value[ j ] == c[ j ] ) { + p |= m[ j ]; + + } else if ( value[ j ] != '-' ) { + return LDAP_OTHER; + } + } + break; + + default: + return LDAP_OTHER; } *crit = c; @@ -363,7 +395,7 @@ static int get_url_perms( return LDAP_OTHER; } -#endif /* LDAP_PF_LOCAL */ +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ /* port = 0 indicates AF_LOCAL */ static int slap_get_listener_addresses( @@ -389,9 +421,9 @@ static int slap_get_listener_addresses( if ( strlen(host) > (sizeof(((struct sockaddr_un *)*sap)->sun_path) - 1) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_get_listener_addresses: domain socket path (%s) too long in URL\n", - host )); + LDAP_LOG( CONNECTION, INFO, + "slap_get_listener_addresses: domain socket path (%s) " + "too long in URL\n", host, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: domain socket path (%s) too long in URL", @@ -414,14 +446,14 @@ static int slap_get_listener_addresses( memset( &hints, '\0', sizeof(hints) ); hints.ai_flags = AI_PASSIVE; hints.ai_socktype = SOCK_STREAM; - hints.ai_family = AF_UNSPEC; + hints.ai_family = slap_inet4or6; snprintf(serv, sizeof serv, "%d", port); if ( (err = getaddrinfo(host, serv, &hints, &res)) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, + LDAP_LOG( CONNECTION, INFO, "slap_get_listener_addresses: getaddrinfo failed: %s\n", - AC_GAI_STRERROR(err) )); + AC_GAI_STRERROR(err), 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n", AC_GAI_STRERROR(err), 0, 0); @@ -444,9 +476,9 @@ static int slap_get_listener_addresses( for ( sai=res; sai; sai=sai->ai_next ) { if( sai->ai_addr == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, + LDAP_LOG( CONNECTION, INFO, "slap_get_listener_addresses: " - "getaddrinfo ai_addr is NULL?\n" )); + "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: " "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 ); @@ -501,9 +533,8 @@ static int slap_get_listener_addresses( he = gethostbyname( host ); if( he == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_get_listener_addresses: invalid host %s\n", - host )); + LDAP_LOG( CONNECTION, INFO, + "slap_get_listener_addresses: invalid host %s\n", host, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: invalid host %s", host, 0, 0); @@ -558,18 +589,21 @@ static int slap_open_listener( int err, addrlen = 0; struct sockaddr **sal, **psal; int socktype = SOCK_STREAM; /* default to COTS */ -#ifdef LDAP_PF_LOCAL - mode_t perms = S_IRWXU; + +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) + /* + * use safe defaults + */ int crit = 1; -#endif +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ rc = ldap_url_parse( url, &lud ); if( rc != LDAP_URL_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slap_open_listener: listen URL \"%s\" parse error %d\n", - url, rc )); + LDAP_LOG( CONNECTION, ERR, + "slap_open_listener: listen URL \"%s\" parse error %d\n", + url, rc , 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: listen URL \"%s\" parse error=%d\n", @@ -578,12 +612,13 @@ static int slap_open_listener( return rc; } + l.sl_url.bv_val = NULL; + #ifndef HAVE_TLS if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: TLS is not supported (%s)\n", - url )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: TLS is not supported (%s)\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: TLS not supported (%s)\n", @@ -615,16 +650,11 @@ static int slap_open_listener( } else { err = slap_get_listener_addresses(lud->lud_host, 0, &sal); } - - if ( lud->lud_exts ) { - err = get_url_perms( lud->lud_exts, &perms, &crit ); - } #else #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: URL scheme is not supported: %s\n", - url )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: URL scheme is not supported: %s\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s", url, 0, 0); @@ -645,6 +675,14 @@ static int slap_open_listener( } } +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) + if ( lud->lud_exts ) { + err = get_url_perms( lud->lud_exts, &l.sl_perms, &crit ); + } else { + l.sl_perms = S_IRWXU; + } +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ + ldap_free_urldesc( lud ); if ( err ) { return -1; @@ -675,16 +713,15 @@ static int slap_open_listener( continue; } #ifdef LDAP_CONNECTIONLESS - if (l.sl_is_udp) - socktype = SOCK_DGRAM; + if( l.sl_is_udp ) socktype = SOCK_DGRAM; #endif l.sl_sd = socket( (*sal)->sa_family, socktype, 0); if ( l.sl_sd == AC_SOCKET_INVALID ) { int err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slap_open_listener: socket() failed errno=%d (%s)\n", - err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, ERR, + "slap_open_listener: socket() failed errno=%d (%s)\n", + err, sock_errstr(err), 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: socket() failed errno=%d (%s)\n", err, @@ -696,9 +733,9 @@ static int slap_open_listener( #ifndef HAVE_WINSOCK if ( l.sl_sd >= dtblsize ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slap_open_listener: listener descriptor %ld is too great %ld\n", - (long)l.sl_sd, (long)dtblsize )); + LDAP_LOG( CONNECTION, ERR, + "slap_open_listener: listener descriptor %ld is too " + "great %ld\n", (long)l.sl_sd, (long)dtblsize, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: listener descriptor %ld is too great %ld\n", @@ -723,9 +760,10 @@ static int slap_open_listener( if ( rc == AC_SOCKET_ERROR ) { int err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) failed errno %d (%s)\n", - (long)l.sl_sd, err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) " + "failed errno %d (%s)\n", (long)l.sl_sd, err, + sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n", @@ -741,6 +779,24 @@ static int slap_open_listener( break; #ifdef LDAP_PF_INET6 case AF_INET6: +#ifdef IPV6_V6ONLY + /* Try to use IPv6 sockets for IPv6 only */ + tmp = 1; + rc = setsockopt( l.sl_sd, IPPROTO_IPV6, IPV6_V6ONLY, + (char *) &tmp, sizeof(tmp) ); + if ( rc == AC_SOCKET_ERROR ) { + int err = sock_errno(); +#ifdef NEW_LOGGING + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: setsockopt( %ld, IPV6_V6ONLY ) failed errno %d (%s)\n", + (long)l.sl_sd, err, sock_errstr(err) ); +#else + Debug( LDAP_DEBUG_ANY, + "slapd(%ld): setsockopt(IPV6_V6ONLY) failed errno=%d (%s)\n", + (long) l.sl_sd, err, sock_errstr(err) ); +#endif + } +#endif addrlen = sizeof(struct sockaddr_in6); break; #endif @@ -754,9 +810,9 @@ static int slap_open_listener( if (bind(l.sl_sd, *sal, addrlen)) { err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: bind(%ld) failed errno=%d (%s)\n", - (long)l.sl_sd, err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: bind(%ld) failed errno=%d (%s)\n", + (long)l.sl_sd, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n", (long) l.sl_sd, err, sock_errstr(err) ); @@ -770,12 +826,12 @@ static int slap_open_listener( #ifdef LDAP_PF_LOCAL case AF_LOCAL: { char *addr = ((struct sockaddr_un *)*sal)->sun_path; - if ( chmod( addr, perms ) < 0 && crit ) { + if ( chmod( addr, l.sl_perms ) < 0 && crit ) { int err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n", - (long)l.sl_sd, err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n", + (long)l.sl_sd, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)", (long) l.sl_sd, err, sock_errstr(err) ); @@ -784,8 +840,10 @@ static int slap_open_listener( slap_free_listener_addresses(psal); return -1; } - l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") ); - sprintf( l.sl_name, "PATH=%s", addr ); + l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1; + l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 ); + snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, + "PATH=%s", addr ); } break; #endif /* LDAP_PF_LOCAL */ @@ -800,9 +858,11 @@ static int slap_open_listener( s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr ); #endif port = ntohs( ((struct sockaddr_in *)*sal) ->sin_port ); - l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") ); - sprintf( l.sl_name, "IP=%s:%d", - s != NULL ? s : "unknown" , port ); + l.sl_name.bv_val = ber_memalloc( sizeof("IP=255.255.255.255:65535") ); + snprintf( l.sl_name.bv_val, sizeof("IP=255.255.255.255:65535"), + "IP=%s:%d", + s != NULL ? s : SLAP_STRING_UNKNOWN, port ); + l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; #ifdef LDAP_PF_INET6 @@ -811,16 +871,19 @@ static int slap_open_listener( inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr, addr, sizeof addr); port = ntohs( ((struct sockaddr_in6 *)*sal)->sin6_port ); - l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") ); - sprintf( l.sl_name, "IP=%s %d", addr, port ); + l.sl_name.bv_len = strlen(addr) + sizeof("IP= 65535"); + l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len ); + snprintf( l.sl_name.bv_val, l.sl_name.bv_len, "IP=%s %d", + addr, port ); + l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; #endif /* LDAP_PF_INET6 */ default: #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_open_listener: unsupported address family (%d)\n", - (int)(*sal)->sa_family )); + LDAP_LOG( CONNECTION, INFO, + "slap_open_listener: unsupported address family (%d)\n", + (int)(*sal)->sa_family, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n", (int) (*sal)->sa_family, 0, 0 ); @@ -829,7 +892,7 @@ static int slap_open_listener( } AC_MEMCPY(&l.sl_sa, *sal, addrlen); - l.sl_url = ch_strdup( url ); + ber_str2bv( url, 0, 1, &l.sl_url); li = ch_malloc( sizeof( Listener ) ); *li = l; slap_listeners[*cur] = li; @@ -840,13 +903,25 @@ static int slap_open_listener( slap_free_listener_addresses(psal); + if ( l.sl_url.bv_val == NULL ) + { +#ifdef NEW_LOGGING + LDAP_LOG( CONNECTION, RESULTS, + "slap_open_listener: failed on %s\n", url, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_open_listener: failed on %s\n", url, 0, 0 ); +#endif + return -1; + } #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS, - "slap_open_listener: daemon initialized %s\n", l.sl_url )); + LDAP_LOG( CONNECTION, RESULTS, + "slap_open_listener: daemon initialized %s\n", + l.sl_url.bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n", - l.sl_url, 0, 0 ); + l.sl_url.bv_val, 0, 0 ); #endif return 0; } @@ -860,9 +935,8 @@ int slapd_daemon_init( const char *urls ) char **u; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ARGS, - "slapd_daemon_init: %s\n", - urls ? urls : "" )); + LDAP_LOG( CONNECTION, ARGS, + "slapd_daemon_init: %s\n", urls ? urls : "", 0, 0 ); #else Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n", urls ? urls : "", 0, 0 ); @@ -892,8 +966,8 @@ int slapd_daemon_init( const char *urls ) */ if( (rc = lutil_pair( wake_sds )) < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slap_daemon_init: lutil_pair() failed rc=%d\n", rc )); + LDAP_LOG( CONNECTION, ERR, + "slap_daemon_init: lutil_pair() failed rc=%d\n", rc, 0, 0); #else Debug( LDAP_DEBUG_ANY, "daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 ); @@ -908,12 +982,12 @@ int slapd_daemon_init( const char *urls ) urls = "ldap:///"; } - u = str2charray( urls, " " ); + u = ldap_str2charray( urls, " " ); if( u == NULL || u[0] == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slap_daemon_init: no urls (%s) provided.\n", urls )); + LDAP_LOG( CONNECTION, ERR, + "slap_daemon_init: no urls (%s) provided.\n", urls, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n", urls, 0, 0 ); @@ -923,8 +997,8 @@ int slapd_daemon_init( const char *urls ) for( i=0; u[i] != NULL; i++ ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slap_daemon_init: listen on %s\n.", u[i] )); + LDAP_LOG( CONNECTION, DETAIL1, + "slap_daemon_init: listen on %s\n.", u[i], 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon_init: listen on %s\n", u[i], 0, 0 ); @@ -933,19 +1007,19 @@ int slapd_daemon_init( const char *urls ) if( i == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_daemon_init: no listeners to open (%s)\n", urls )); + LDAP_LOG( CONNECTION, INFO, + "slap_daemon_init: no listeners to open (%s)\n", urls, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon_init: no listeners to open (%s)\n", urls, 0, 0 ); #endif - charray_free( u ); + ldap_charray_free( u ); return -1; } #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slap_daemon_init: %d listeners to open...\n", i )); + LDAP_LOG( CONNECTION, INFO, + "slap_daemon_init: %d listeners to open...\n", i, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners to open...\n", i, 0, 0 ); @@ -954,15 +1028,15 @@ int slapd_daemon_init( const char *urls ) for(n = 0, j = 0; u[n]; n++ ) { if ( slap_open_listener( u[n], &i, &j ) ) { - charray_free( u ); + ldap_charray_free( u ); return -1; } } slap_listeners[j] = NULL; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slap_daemon_init: %d listeners opened\n", i )); + LDAP_LOG( CONNECTION, DETAIL1, + "slap_daemon_init: %d listeners opened\n", i, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners opened\n", i, 0, 0 ); @@ -973,7 +1047,7 @@ int slapd_daemon_init( const char *urls ) slapd_slp_reg(); #endif - charray_free( u ); + ldap_charray_free( u ); ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex ); return !i; } @@ -1004,9 +1078,9 @@ close_listeners( int l; for ( l = 0; slap_listeners[l] != NULL; l++ ) { - if ( remove ) - slapd_remove( slap_listeners[l]->sl_sd, 0 ); if ( slap_listeners[l]->sl_sd != AC_SOCKET_INVALID ) { + if ( remove ) + slapd_remove( slap_listeners[l]->sl_sd, 0 ); #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 ); @@ -1014,10 +1088,10 @@ close_listeners( #endif /* LDAP_PF_LOCAL */ slapd_close( slap_listeners[l]->sl_sd ); } - if ( slap_listeners[l]->sl_url ) - free ( slap_listeners[l]->sl_url ); - if ( slap_listeners[l]->sl_name ) - free ( slap_listeners[l]->sl_name ); + if ( slap_listeners[l]->sl_url.bv_val ) + ber_memfree( slap_listeners[l]->sl_url.bv_val ); + if ( slap_listeners[l]->sl_name.bv_val ) + ber_memfree( slap_listeners[l]->sl_name.bv_val ); free ( slap_listeners[l] ); slap_listeners[l] = NULL; } @@ -1044,8 +1118,7 @@ slapd_daemon_task( * listening port. The listen() and accept() calls * are unnecessary. */ - if ( slap_listeners[l]->sl_is_udp ) - { + if ( slap_listeners[l]->sl_is_udp ) { slapd_add( slap_listeners[l]->sl_sd ); continue; } @@ -1053,14 +1126,51 @@ slapd_daemon_task( if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) { int err = sock_errno(); + +#ifdef LDAP_PF_INET6 + /* If error is EADDRINUSE, we are trying to listen to INADDR_ANY and + * we are already listening to in6addr_any, then we want to ignore + * this and continue. + */ + if ( err == EADDRINUSE ) { + int i; + struct sockaddr_in sa = slap_listeners[l]->sl_sa.sa_in_addr; + struct sockaddr_in6 sa6; + + if ( sa.sin_family == AF_INET && + sa.sin_addr.s_addr == htonl(INADDR_ANY) ) { + for ( i = 0 ; i < l; i++ ) { + sa6 = slap_listeners[i]->sl_sa.sa_in6_addr; + if ( sa6.sin6_family == AF_INET6 && + !memcmp( &sa6.sin6_addr, &in6addr_any, sizeof(struct in6_addr) ) ) + break; + } + + if ( i < l ) { + /* We are already listening to in6addr_any */ #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n", - slap_listeners[l]->sl_url, err, sock_errstr(err) )); + LDAP_LOG(CONNECTION, WARNING, + "slapd_daemon_task: Attempt to listen to 0.0.0.0 failed, already listening on ::, assuming IPv4 included\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_CONNS, + "daemon: Attempt to listen to 0.0.0.0 failed, already listening on ::, assuming IPv4 included\n", + 0, 0, 0 ); +#endif + slapd_close( slap_listeners[l]->sl_sd ); + slap_listeners[l]->sl_sd = AC_SOCKET_INVALID; + continue; + } + } + } +#endif +#ifdef NEW_LOGGING + LDAP_LOG( CONNECTION, ERR, + "slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n", + slap_listeners[l]->sl_url.bv_val, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "daemon: listen(%s, 5) failed errno=%d (%s)\n", - slap_listeners[l]->sl_url, err, + slap_listeners[l]->sl_url.bv_val, err, sock_errstr(err) ); #endif return( (void*)-1 ); @@ -1114,17 +1224,18 @@ slapd_daemon_task( if( slapd_gentle_shutdown ) { ber_socket_t active; - if( slapd_gentle_shutdown > 0 ) { + if( slapd_gentle_shutdown == 1 ) { Debug( LDAP_DEBUG_ANY, "slapd gentle shutdown\n", 0, 0, 0 ); close_listeners( 1 ); - slapd_gentle_shutdown = -1; + global_restrictops |= SLAP_RESTRICT_OP_WRITES; + slapd_gentle_shutdown = 2; } ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); active = slap_daemon.sd_nactives; ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); if( active == 0 ) { - slapd_shutdown = -1; + slapd_shutdown = 2; break; } } @@ -1182,9 +1293,10 @@ slapd_daemon_task( continue; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slapd_daemon_task: select: listen=%d active_threads=%d tvp=%s\n", - slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" )); + LDAP_LOG( CONNECTION, DETAIL1, + "slapd_daemon_task: select: listen=%d " + "active_threads=%d tvp=%s\n", + slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" ); #else Debug( LDAP_DEBUG_CONNS, "daemon: select: listen=%d active_threads=%d tvp=%s\n", @@ -1217,9 +1329,9 @@ slapd_daemon_task( if( err != EINTR ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slapd_daemon_task: select failed (%d): %s\n", - err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, INFO, + "slapd_daemon_task: select failed (%d): %s\n", + err, sock_errstr(err), 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: select failed (%d): %s\n", @@ -1233,8 +1345,8 @@ slapd_daemon_task( case 0: /* timeout - let threads run */ ebadf = 0; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - "slapd_daemon_task: select timeout - yielding\n" )); + LDAP_LOG( CONNECTION, DETAIL2, + "slapd_daemon_task: select timeout - yielding\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n", 0, 0, 0 ); @@ -1247,8 +1359,8 @@ slapd_daemon_task( ebadf = 0; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - "slapd_daemon_task: activity on %d descriptors\n", ns )); + LDAP_LOG( CONNECTION, DETAIL2, + "slapd_daemon_task: activity on %d descriptors\n", ns, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: activity on %d descriptors\n", ns, 0, 0 ); @@ -1259,7 +1371,7 @@ slapd_daemon_task( if( FD_ISSET( wake_sds[0], &readfds ) ) { char c[BUFSIZ]; tcp_read( wake_sds[0], c, sizeof(c) ); -#ifdef NO_THREADS +#if defined(NO_THREADS) || defined(HAVE_GNU_PTH) waking = 0; #endif continue; @@ -1271,9 +1383,12 @@ slapd_daemon_task( long id; slap_ssf_t ssf = 0; char *authid = NULL; +#ifdef SLAPD_RLOOKUPS + char *hebuf = NULL; +#endif char *dnsname = NULL; - char *peeraddr; + char *peeraddr = NULL; #ifdef LDAP_PF_LOCAL char peername[MAXPATHLEN + sizeof("PATH=")]; #elif defined(LDAP_PF_INET6) @@ -1291,18 +1406,15 @@ slapd_daemon_task( continue; #ifdef LDAP_CONNECTIONLESS - if ( slap_listeners[l]->sl_is_udp ) - { - /* The first time we receive a query, we set this - * up as a "connection". It remains open for the life - * of the slapd. - */ - if ( slap_listeners[l]->sl_is_udp < 2 ) - { + if ( slap_listeners[l]->sl_is_udp ) { + /* The first time we receive a query, we set this + * up as a "connection". It remains open for the life + * of the slapd. + */ + if ( slap_listeners[l]->sl_is_udp < 2 ) { id = connection_init( - slap_listeners[l]->sl_sd, - slap_listeners[l]->sl_url, "", "", - slap_listeners[l]->sl_name, + slap_listeners[l]->sl_sd, + slap_listeners[l], "", "", 2, ssf, authid ); slap_listeners[l]->sl_is_udp++; } @@ -1331,9 +1443,10 @@ slapd_daemon_task( if( emfile < 3 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, + LDAP_LOG( CONNECTION, ERR, "slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n", - (long)slap_listeners[l]->sl_sd, err, sock_errstr(err) )); + (long)slap_listeners[l]->sl_sd, + err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "daemon: accept(%ld) failed errno=%d (%s)\n", @@ -1358,9 +1471,9 @@ slapd_daemon_task( /* make sure descriptor number isn't too great */ if ( s >= dtblsize ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, + LDAP_LOG( CONNECTION, ERR, "slapd_daemon_task: %ld beyond descriptor table size %ld\n", - (long)s, (long)dtblsize )); + (long)s, (long)dtblsize, 0 ); #else Debug( LDAP_DEBUG_ANY, "daemon: %ld beyond descriptor table size %ld\n", @@ -1400,9 +1513,10 @@ slapd_daemon_task( if ( rc == AC_SOCKET_ERROR ) { int err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE) failed errno=%d (%s)\n", - (long)s, err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, ERR, + "slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE)" + " failed errno=%d (%s)\n", + (long)s, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "slapd(%ld): setsockopt(SO_KEEPALIVE) failed " @@ -1418,9 +1532,10 @@ slapd_daemon_task( if ( rc == AC_SOCKET_ERROR ) { int err = sock_errno(); #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slapd_daemon_task: setsockopt( %ld, TCP_NODELAY) failed errno=%d (%s)\n", - (long)s, err, sock_errstr(err) )); + LDAP_LOG( CONNECTION, ERR, + "slapd_daemon_task: setsockopt( %ld, " + "TCP_NODELAY) failed errno=%d (%s)\n", + (long)s, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "slapd(%ld): setsockopt(TCP_NODELAY) failed " @@ -1432,8 +1547,8 @@ slapd_daemon_task( #endif #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1, - "slapd_daemon_task: new connection on %ld\n", (long)s )); + LDAP_LOG( CONNECTION, DETAIL1, + "slapd_daemon_task: new connection on %ld\n", (long)s, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n", (long) s, 0, 0 ); @@ -1443,6 +1558,19 @@ slapd_daemon_task( case AF_LOCAL: sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path ); ssf = LDAP_PVT_SASL_LOCAL_SSF; + { + uid_t uid; + gid_t gid; + + if( getpeereid( s, &uid, &gid ) == 0 ) { + authid = ch_malloc( + sizeof("uidNumber=4294967295+gidNumber=4294967295," + "cn=peercred,cn=external,cn=auth")); + sprintf(authid, "uidNumber=%d+gidNumber=%d," + "cn=peercred,cn=external,cn=auth", + uid, gid); + } + } dnsname = "local"; break; #endif /* LDAP_PF_LOCAL */ @@ -1453,14 +1581,16 @@ slapd_daemon_task( peeraddr = inet_ntoa( *((struct in_addr *) &from.sa_in6_addr.sin6_addr.s6_addr[12]) ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } else { char addr[INET6_ADDRSTRLEN]; + + peeraddr = (char *) inet_ntop( AF_INET6, + &from.sa_in6_addr.sin6_addr, + addr, sizeof addr ); sprintf( peername, "IP=%s %d", - inet_ntop( AF_INET6, - &from.sa_in6_addr.sin6_addr, - addr, sizeof addr) ? addr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } break; @@ -1469,7 +1599,7 @@ slapd_daemon_task( case AF_INET: peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in_addr.sin_port ) ); break; @@ -1485,18 +1615,22 @@ slapd_daemon_task( ) { #ifdef SLAPD_RLOOKUPS if ( use_reverse_lookup ) { + struct hostent he; + int herr; + struct hostent *hp = NULL; # ifdef LDAP_PF_INET6 if ( from.sa_addr.sa_family == AF_INET6 ) - hp = gethostbyaddr( + ldap_pvt_gethostbyaddr_a( (char *)&(from.sa_in6_addr.sin6_addr), sizeof(from.sa_in6_addr.sin6_addr), - AF_INET6 ); + AF_INET6, &he, &hebuf, + &hp, &herr ); else # endif /* LDAP_PF_INET6 */ - hp = gethostbyaddr( + ldap_pvt_gethostbyaddr_a( (char *) &(from.sa_in_addr.sin_addr), sizeof(from.sa_in_addr.sin_addr), - AF_INET ); + AF_INET, &he, &hebuf, &hp, &herr ); dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL; } #else @@ -1505,16 +1639,16 @@ slapd_daemon_task( #ifdef HAVE_TCPD if ( !hosts_ctl("slapd", - dnsname != NULL ? dnsname : STRING_UNKNOWN, - peeraddr != NULL ? peeraddr : STRING_UNKNOWN, - STRING_UNKNOWN )) + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, + SLAP_STRING_UNKNOWN )) { /* DENY ACCESS */ - Statslog( LDAP_DEBUG_ANY, - "fd=%ld host access from %s (%s) denied.\n", + Statslog( LDAP_DEBUG_STATS, + "fd=%ld DENIED from %s (%s)", (long) s, - dnsname != NULL ? dnsname : "unknown", - peeraddr != NULL ? peeraddr : "unknown", + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, 0, 0 ); slapd_close(s); continue; @@ -1523,10 +1657,9 @@ slapd_daemon_task( } id = connection_init(s, - slap_listeners[l]->sl_url, - dnsname != NULL ? dnsname : "unknown", + slap_listeners[l], + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, peername, - slap_listeners[l]->sl_name, #ifdef HAVE_TLS slap_listeners[l]->sl_is_tls, #else @@ -1536,28 +1669,35 @@ slapd_daemon_task( authid ); if( authid ) ch_free(authid); +#ifdef SLAPD_RLOOKUPS + if( hebuf ) ldap_memfree(hebuf); +#endif if( id < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_INFO, - "slapd_daemon_task: connection_init(%ld, %s, %s) failed.\n", - (long)s, peername, slap_listeners[l]->sl_name )); + LDAP_LOG( CONNECTION, INFO, + "slapd_daemon_task: " + "connection_init(%ld, %s, %s) " + "failed.\n", + (long)s, peername, + slap_listeners[l]->sl_name.bv_val ); #else Debug( LDAP_DEBUG_ANY, - "daemon: connection_init(%ld, %s, %s) failed.\n", + "daemon: connection_init(%ld, %s, %s) " + "failed.\n", (long) s, peername, - slap_listeners[l]->sl_name ); + slap_listeners[l]->sl_name.bv_val ); #endif slapd_close(s); continue; } Statslog( LDAP_DEBUG_STATS, - "daemon: conn=%ld fd=%ld connection from %s (%s) accepted.\n", + "conn=%ld fd=%ld ACCEPT from %s (%s)\n", id, (long) s, peername, - slap_listeners[l]->sl_name, + slap_listeners[l]->sl_name.bv_val, 0 ); slapd_add( s ); @@ -1566,16 +1706,16 @@ slapd_daemon_task( #ifdef LDAP_DEBUG #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - "slapd_daemon_task: activity on " )); + LDAP_LOG( CONNECTION, DETAIL2, + "slapd_daemon_task: activity on ", 0, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 ); #endif #ifdef HAVE_WINSOCK for ( i = 0; i < readfds.fd_count; i++ ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - " %d%s", readfds.fd_array[i], "r", 0 )); + LDAP_LOG( CONNECTION, DETAIL2, + " %d%s", readfds.fd_array[i], "r", 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, " %d%s", readfds.fd_array[i], "r", 0 ); @@ -1583,8 +1723,8 @@ slapd_daemon_task( } for ( i = 0; i < writefds.fd_count; i++ ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - " %d%s", writefds.fd_array[i], "w" )); + LDAP_LOG( CONNECTION, DETAIL2, + " %d%s", writefds.fd_array[i], "w" , 0 ); #else Debug( LDAP_DEBUG_CONNS, " %d%s", writefds.fd_array[i], "w", 0 ); @@ -1602,8 +1742,7 @@ slapd_daemon_task( /* The listener is the data port. Don't * skip it. */ - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break; @@ -1616,9 +1755,8 @@ slapd_daemon_task( w = FD_ISSET( i, &writefds ); if ( r || w ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - " %d%s%s", i, - r ? "r" : "", w ? "w" : "" )); + LDAP_LOG( CONNECTION, DETAIL2, + " %d%s%s", i, r ? "r" : "", w ? "w" : "" ); #else Debug( LDAP_DEBUG_CONNS, " %d%s%s", i, r ? "r" : "", w ? "w" : "" ); @@ -1627,7 +1765,7 @@ slapd_daemon_task( } #endif #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, "\n" )); + LDAP_LOG( CONNECTION, DETAIL2, "\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 ); #endif @@ -1655,8 +1793,7 @@ slapd_daemon_task( for ( l = 0; slap_listeners[l] != NULL; l++ ) { if ( i == slap_listeners[l]->sl_sd ) { #ifdef LDAP_CONNECTIONLESS - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break; @@ -1666,8 +1803,8 @@ slapd_daemon_task( continue; } #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - "slapd_daemon_task: write active on %d\n", wd )); + LDAP_LOG( CONNECTION, DETAIL2, + "slapd_daemon_task: write active on %d\n", wd, 0, 0 ); #else Debug( LDAP_DEBUG_CONNS, "daemon: write active on %d\n", @@ -1707,8 +1844,7 @@ slapd_daemon_task( for ( l = 0; slap_listeners[l] != NULL; l++ ) { if ( rd == slap_listeners[l]->sl_sd ) { #ifdef LDAP_CONNECTIONLESS - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break; @@ -1719,8 +1855,8 @@ slapd_daemon_task( } #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, - "slapd_daemon_task: read activity on %d\n", rd )); + LDAP_LOG( CONNECTION, DETAIL2, + "slapd_daemon_task: read activity on %d\n", rd, 0, 0 ); #else Debug ( LDAP_DEBUG_CONNS, "daemon: read activity on %d\n", rd, 0, 0 ); @@ -1741,8 +1877,8 @@ slapd_daemon_task( if( slapd_shutdown == 1 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slapd_daemon_task: shutdown requested and initiated.\n")); + LDAP_LOG( CONNECTION, CRIT, + "slapd_daemon_task: shutdown requested and initiated.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon: shutdown requested and initiated.\n", @@ -1752,8 +1888,9 @@ slapd_daemon_task( } else if ( slapd_shutdown == 2 ) { #ifdef HAVE_NT_SERVICE_MANAGER #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slapd_daemon_task: shutdown initiated by Service Manager.\n")); + LDAP_LOG( CONNECTION, CRIT, + "slapd_daemon_task: shutdown initiated by Service Manager.\n", + 0, 0, 0); #else Debug( LDAP_DEBUG_TRACE, "daemon: shutdown initiated by Service Manager.\n", @@ -1761,8 +1898,9 @@ slapd_daemon_task( #endif #else /* !HAVE_NT_SERVICE_MANAGER */ #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slapd_daemon_task: abnormal condition, shutdown initiated.\n" )); + LDAP_LOG( CONNECTION, CRIT, + "slapd_daemon_task: abnormal condition, " + "shutdown initiated.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon: abnormal condition, shutdown initiated.\n", @@ -1771,8 +1909,9 @@ slapd_daemon_task( #endif /* !HAVE_NT_SERVICE_MANAGER */ } else { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slapd_daemon_task: no active streams, shutdown initiated.\n" )); + LDAP_LOG( CONNECTION, CRIT, + "slapd_daemon_task: no active streams, shutdown initiated.\n", + 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon: no active streams, shutdown initiated.\n", @@ -1780,15 +1919,15 @@ slapd_daemon_task( #endif } - if( slapd_gentle_shutdown >= 0 ) + if( slapd_gentle_shutdown != 2 ) close_listeners ( 0 ); free ( slap_listeners ); slap_listeners = NULL; #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slapd_daemon_task: shutdown waiting for %d threads to terminate.\n", - ldap_pvt_thread_pool_backload(&connection_pool) )); + LDAP_LOG( CONNECTION, CRIT, + "slapd_daemon_task: shutdown waiting for %d threads to terminate.\n", + ldap_pvt_thread_pool_backload(&connection_pool), 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "slapd shutdown: waiting for %d threads to terminate\n", @@ -1817,8 +1956,9 @@ int slapd_daemon( void ) if ( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_ERR, - "slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n", rc )); + LDAP_LOG( CONNECTION, ERR, + "slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n", + rc, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 ); @@ -1891,8 +2031,8 @@ RETSIGTYPE slap_sig_shutdown( int sig ) { #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slap_sig_shutdown: signal %d\n", sig )); + LDAP_LOG( CONNECTION, CRIT, + "slap_sig_shutdown: signal %d\n", sig, 0, 0 ); #else Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0); #endif @@ -1906,8 +2046,8 @@ slap_sig_shutdown( int sig ) #if HAVE_NT_SERVICE_MANAGER && SIGBREAK if (is_NT_Service && sig == SIGBREAK) #ifdef NEW_LOGGING - LDAP_LOG(( "connection", LDAP_LEVEL_CRIT, - "slap_sig_shutdown: SIGBREAK ignored.\n" )); + LDAP_LOG( CONNECTION, CRIT, + "slap_sig_shutdown: SIGBREAK ignored.\n", 0, 0, 0 ); #else Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n", 0, 0, 0);