X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=07a7d6e22a109e88382ce16c248bd8ad90d514bd;hb=811929011d6a0967d737eaf6c1acc76decb91893;hp=560a0d21ca653dc4e376df87d00a0fe42b4d087f;hpb=b21e69db0e47be1b5ed96f4460fcfa6790ff98b3;p=openldap

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 560a0d21ca..07a7d6e22a 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],
@@ -679,7 +679,7 @@ static int slap_open_listener(
 	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 +826,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 +841,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, 
@@ -1561,9 +1563,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);
 					}
@@ -1613,7 +1615,7 @@ slapd_daemon_task(
 #ifdef SLAPD_RLOOKUPS
 				if ( use_reverse_lookup ) {
 					char *herr;
-					if (ldap_pvt_get_hname( &from, len, hbuf,
+					if (ldap_pvt_get_hname( (const struct sockaddr *)&from, len, hbuf,
 						sizeof(hbuf), &herr ) == 0) {
 						ldap_pvt_str2lower( hbuf );
 						dnsname = hbuf;