X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=e61feceb12ae2c7505a29cc5d29c38ffeb6cb7bf;hb=9b4bf8a973c8cfea809be9a4b658f785a6b16f2f;hp=31de5188007d3f683acd35ec0cdbe441630b8419;hpb=1e8fd55cfbb2b8eeda11c68935f34b057f6a40b9;p=openldap

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 31de518800..e61feceb12 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -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],
@@ -1203,9 +1203,6 @@ slapd_daemon_task(
 		fd_set			writefds;
 		Sockaddr		from;
 
-#if defined(SLAPD_RLOOKUPS)
-		struct hostent		*hp;
-#endif
 		struct timeval		zero;
 		struct timeval		*tvp;
 
@@ -1384,7 +1381,7 @@ slapd_daemon_task(
 			slap_ssf_t ssf = 0;
 			char *authid = NULL;
 #ifdef SLAPD_RLOOKUPS
-			char *hebuf = NULL;
+			char hbuf[NI_MAXHOST];
 #endif
 
 			char	*dnsname = NULL;
@@ -1564,9 +1561,9 @@ slapd_daemon_task(
 
 					if( getpeereid( s, &uid, &gid ) == 0 ) {
 						authid = ch_malloc(
-							sizeof("uidNumber=4294967295+gidNumber=4294967295,"
+							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",
 							(int) uid, (int) gid);
 					}
@@ -1615,23 +1612,12 @@ 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 )
-						ldap_pvt_gethostbyaddr_a(
-							(char *)&(from.sa_in6_addr.sin6_addr),
-							sizeof(from.sa_in6_addr.sin6_addr),
-							AF_INET6, &he, &hebuf,
-							&hp, &herr );
-					else
-#  endif /* LDAP_PF_INET6 */
-					ldap_pvt_gethostbyaddr_a(
-						(char *) &(from.sa_in_addr.sin_addr),
-						sizeof(from.sa_in_addr.sin_addr),
-						AF_INET, &he, &hebuf, &hp, &herr );
-					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;
@@ -1669,9 +1655,6 @@ slapd_daemon_task(
 				authid );
 
 			if( authid ) ch_free(authid);
-#ifdef SLAPD_RLOOKUPS
-			if( hebuf ) ldap_memfree(hebuf);
-#endif
 
 			if( id < 0 ) {
 #ifdef NEW_LOGGING
@@ -1919,11 +1902,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",