X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=e42565af46a7fc541a696d07c6ec4d69ffcafb7d;hb=331e6275418bda0735d4952f64d51518881d10a8;hp=ab9c202f0722f122a2e4d73230be7b166abad579;hpb=7c4445aed4979cbea7967da649a4581ecbdb21d2;p=openldap

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index ab9c202f07..e42565af46 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
  */
 
@@ -107,7 +107,7 @@ void slapd_slp_init( const char* urls ) {
 		if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) {
 			char *host = ldap_pvt_get_fqdn( NULL );
 			if ( host != NULL ) {
-				slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+				slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
 					strlen( host ) +
 					sizeof( LDAP_SRVTYPE_PREFIX ) );
 				strcpy( lutil_strcopy(slapd_srvurls[i],
@@ -119,7 +119,7 @@ void slapd_slp_init( const char* urls ) {
 		} else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) {
 			char *host = ldap_pvt_get_fqdn( NULL );
 			if ( host != NULL ) {
-				slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+				slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
 					strlen( host ) +
 					sizeof( LDAPS_SRVTYPE_PREFIX ) );
 				strcpy( lutil_strcopy(slapd_srvurls[i],
@@ -155,6 +155,8 @@ void slapd_slp_regreport(
 void slapd_slp_reg() {
 	int i;
 
+	if( slapd_srvurls == NULL ) return;
+
 	for( i=0; slapd_srvurls[i] != NULL; i++ ) {
 		if( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX,
 				sizeof( LDAP_SRVTYPE_PREFIX ) - 1 ) == 0 ||
@@ -176,6 +178,8 @@ void slapd_slp_reg() {
 void slapd_slp_dereg() {
 	int i;
 
+	if( slapd_srvurls == NULL ) return;
+
 	for( i=0; slapd_srvurls[i] != NULL; i++ ) {
 		SLPDereg( slapd_hslp,
 			slapd_srvurls[i],
@@ -663,9 +667,6 @@ static int slap_open_listener(
 		return -1;
 #endif
 	} else {
-#ifdef LDAP_CONNECTIONLESS
-		l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
-#endif
 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
 			|| strcmp(lud->lud_host, "*") == 0 )
 		{
@@ -674,12 +675,15 @@ static int slap_open_listener(
 			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
 		}
 	}
+#ifdef LDAP_CONNECTIONLESS
+	l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
+#endif
 
 #if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD)
 	if ( lud->lud_exts ) {
 		err = get_url_perms( lud->lud_exts, &l.sl_perms, &crit );
 	} else {
-		l.sl_perms = S_IRWXU;
+		l.sl_perms = S_IRWXU | S_IRWXO;
 	}
 #endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */
 
@@ -826,6 +830,7 @@ static int slap_open_listener(
 #ifdef LDAP_PF_LOCAL
 	case AF_LOCAL: {
 		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
+#if 0 /* don't muck with socket perms */
 		if ( chmod( addr, l.sl_perms ) < 0 && crit ) {
 			int err = sock_errno();
 #ifdef NEW_LOGGING
@@ -840,6 +845,7 @@ static int slap_open_listener(
 			slap_free_listener_addresses(psal);
 			return -1;
 		}
+#endif
 		l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1;
 		l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 );
 		snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, 
@@ -1203,9 +1209,6 @@ slapd_daemon_task(
 		fd_set			writefds;
 		Sockaddr		from;
 
-#if defined(SLAPD_RLOOKUPS)
-		struct hostent		*hp;
-#endif
 		struct timeval		zero;
 		struct timeval		*tvp;
 
@@ -1383,6 +1386,9 @@ slapd_daemon_task(
 			long id;
 			slap_ssf_t ssf = 0;
 			char *authid = NULL;
+#ifdef SLAPD_RLOOKUPS
+			char hbuf[NI_MAXHOST];
+#endif
 
 			char	*dnsname = NULL;
 			char	*peeraddr = NULL;
@@ -1561,11 +1567,11 @@ slapd_daemon_task(
 
 					if( getpeereid( s, &uid, &gid ) == 0 ) {
 						authid = ch_malloc(
-							sizeof("uidNumber=XXXXXX+gidNumber=XXXXXX,"
+							sizeof("uidnumber=4294967295+gidnumber=4294967295,"
 								"cn=peercred,cn=external,cn=auth"));
-						sprintf(authid, "uidNumber=%d+gidNumber=%d,"
+						sprintf(authid, "uidnumber=%d+gidnumber=%d,"
 							"cn=peercred,cn=external,cn=auth",
-							uid, gid);
+							(int) uid, (int) gid);
 					}
 				}
 				dnsname = "local";
@@ -1612,19 +1618,12 @@ slapd_daemon_task(
 			) {
 #ifdef SLAPD_RLOOKUPS
 				if ( use_reverse_lookup ) {
-#  ifdef LDAP_PF_INET6
-					if ( from.sa_addr.sa_family == AF_INET6 )
-						hp = gethostbyaddr(
-							(char *)&(from.sa_in6_addr.sin6_addr),
-							sizeof(from.sa_in6_addr.sin6_addr),
-							AF_INET6 );
-					else
-#  endif /* LDAP_PF_INET6 */
-					hp = gethostbyaddr(
-						(char *) &(from.sa_in_addr.sin_addr),
-						sizeof(from.sa_in_addr.sin_addr),
-						AF_INET );
-					dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL;
+					char *herr;
+					if (ldap_pvt_get_hname( (const struct sockaddr *)&from, len, hbuf,
+						sizeof(hbuf), &herr ) == 0) {
+						ldap_pvt_str2lower( hbuf );
+						dnsname = hbuf;
+					}
 				}
 #else
 				dnsname = NULL;
@@ -1638,7 +1637,7 @@ slapd_daemon_task(
 				{
 					/* DENY ACCESS */
 					Statslog( LDAP_DEBUG_STATS,
-						"fd=%ld host access from %s (%s) denied.\n",
+						"fd=%ld DENIED from %s (%s)",
 						(long) s,
 						dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
 						peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN,
@@ -1684,8 +1683,7 @@ slapd_daemon_task(
 			}
 
 			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.bv_val,
@@ -1910,11 +1908,17 @@ slapd_daemon_task(
 #endif
 	}
 
-	if( slapd_gentle_shutdown != 2 )
+	if( slapd_gentle_shutdown != 2 ) {
 		close_listeners ( 0 );
+	}
+
 	free ( slap_listeners );
 	slap_listeners = NULL;
 
+	if( !slapd_gentle_shutdown ) {
+		connections_shutdown();
+	}
+
 #ifdef NEW_LOGGING
 	LDAP_LOG( CONNECTION, CRIT, 
 		"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",