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 5869fe418c98243d965836541c49deb0fa5f705f..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],
@@ -1613,7 +1613,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;