Converted ch_calloc and ch_malloc calls to SLAP_CALLOC and SLAP_MALLOC.

[openldap] / servers / slapd / back-dnssrv / referral.c

diff --git a/servers/slapd/back-dnssrv/referral.c b/servers/slapd/back-dnssrv/referral.c
index 49dbdaf4aeec0e3cfd3a129bc4a588b382e3a895..9aaf23c79c84509c3fa8d649e7e85b27c6b7d285 100644 (file)
--- a/servers/slapd/back-dnssrv/referral.c
+++ b/servers/slapd/back-dnssrv/referral.c
@@ -45,18 +45,16 @@ dnssrv_back_referrals(
                return LDAP_OTHER;
        } 
 
-       if( ldap_dn2domain( dn->bv_val, &domain ) ) {
+       if( ldap_dn2domain( dn->bv_val, &domain ) || domain == NULL ) {
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
                return LDAP_REFERRAL;
        }
 
        Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
-               dn->bv_val,
-               domain == NULL ? "" : domain,
-               0 );
+               dn->bv_val, domain, 0 );
 
-       if( rc = ldap_domain2hostlist( domain, &hostlist ) ) {
+       if( ( rc = ldap_domain2hostlist( domain, &hostlist ) ) ) {
                Debug( LDAP_DEBUG_TRACE,
                        "DNSSRV: domain2hostlist(%s) returned %d\n",
                        domain, rc, 0 );
@@ -65,7 +63,7 @@ dnssrv_back_referrals(
                goto done;
        }
 
-       hosts = str2charray( hostlist, " " );
+       hosts = ldap_str2charray( hostlist, " " );
 
        if( hosts == NULL ) {
                Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charrary error\n", 0, 0, 0 );
@@ -90,7 +88,7 @@ dnssrv_back_referrals(
        }
 
        Statslog( LDAP_DEBUG_STATS,
-           "conn=%ld op=%d DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
+           "conn=%lu op=%lu DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
            op->o_connid, op->o_opid, op->o_protocol,
                dn->bv_val, urls[0].bv_val );
 
@@ -103,7 +101,7 @@ dnssrv_back_referrals(
 done:
        if( domain != NULL ) ch_free( domain );
        if( hostlist != NULL ) ch_free( hostlist );
-       if( hosts != NULL ) charray_free( hosts );
+       if( hosts != NULL ) ldap_charray_free( hosts );
        ber_bvarray_free( urls );
        return rc;
 }