Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index ea1d1b7e7ce236d72ccda23a1b85b5ca46eeac30..e61feceb12ae2c7505a29cc5d29c38ffeb6cb7bf 100644 (file)
--- 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],
@@ -1381,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;
@@ -1561,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);
                                        }
@@ -1612,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;
@@ -1666,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