fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

[openldap] / servers / slapd / referral.c

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index a1330d0ca4785bf35c5045090c907bbb8dc3d448..966651ef2ab59f22f42de3f7a703f22d728f9323 100644 (file)
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,12 +108,7 @@ static char * referral_dn_muck(
                        }
 
                        muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
-                       muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 );
-                       if( muck.bv_val == NULL ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
-                               return NULL;
-                       }
+                       muck.bv_val = ch_malloc( muck.bv_len + 1 );
 
                        strncpy( muck.bv_val, ntargetDN.bv_val,
                                ntargetDN.bv_len-nbaseDN.bv_len );
@@ -145,7 +140,7 @@ int validate_global_referral( const char *url )
        int rc;
        LDAPURLDesc *lurl;
 
-       rc = ldap_url_parse_ext( url, &lurl );
+       rc = ldap_url_parse_ext( url, &lurl, LDAP_PVT_URL_PARSE_NONE );
 
        switch( rc ) {
        case LDAP_URL_SUCCESS:
@@ -153,6 +148,7 @@ int validate_global_referral( const char *url )
 
        case LDAP_URL_ERR_BADSCHEME:
                /* not LDAP hence valid */
+               Debug( LDAP_DEBUG_CONFIG, "referral \"%s\": not LDAP.\n", url, 0, 0 );
                return 0;
 
        default:
@@ -200,63 +196,65 @@ BerVarray referral_rewrite(
        struct berval *target,
        int scope )
 {
-       int i;
-       BerVarray refs;
-       struct berval *iv, *jv;
+       int             i;
+       BerVarray       refs;
+       struct berval   *iv, *jv;
 
-       if( in == NULL ) return NULL;
+       if ( in == NULL ) {
+               return NULL;
+       }
 
-       for( i=0; in[i].bv_val != NULL ; i++ ) {
+       for ( i = 0; !BER_BVISNULL( &in[i] ); i++ ) {
                /* just count them */
        }
 
-       if( i < 1 ) return NULL;
-
-       refs = SLAP_MALLOC( (i+1) * sizeof( struct berval ) );
-       if( refs == NULL ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+       if ( i < 1 ) {
                return NULL;
        }
 
-       for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
-               LDAPURLDesc *url;
-               int rc = ldap_url_parse_ext( iv->bv_val, &url );
+       refs = ch_malloc( ( i + 1 ) * sizeof( struct berval ) );
 
-               if( rc == LDAP_URL_ERR_BADSCHEME ) {
+       for ( iv = in, jv = refs; !BER_BVISNULL( iv ); iv++ ) {
+               LDAPURLDesc     *url;
+               char            *dn;
+               int             rc;
+               
+               rc = ldap_url_parse_ext( iv->bv_val, &url, LDAP_PVT_URL_PARSE_NONE );
+               if ( rc == LDAP_URL_ERR_BADSCHEME ) {
                        ber_dupbv( jv++, iv );
                        continue;
 
-               } else if( rc != LDAP_URL_SUCCESS ) {
+               } else if ( rc != LDAP_URL_SUCCESS ) {
                        continue;
                }
 
-               {
-                       char *dn = url->lud_dn;
-                       url->lud_dn = referral_dn_muck(
-                               ( dn && *dn ) ? dn : NULL,
+               dn = url->lud_dn;
+               url->lud_dn = referral_dn_muck( ( dn && *dn ) ? dn : NULL,
                                base, target );
+               ldap_memfree( dn );
 
-                       ldap_memfree( dn );
-               }
-
-               if( url->lud_scope == LDAP_SCOPE_DEFAULT ) {
+               if ( url->lud_scope == LDAP_SCOPE_DEFAULT ) {
                        url->lud_scope = scope;
                }
 
                jv->bv_val = ldap_url_desc2str( url );
-               jv->bv_len = strlen( jv->bv_val );
+               if ( jv->bv_val != NULL ) {
+                       jv->bv_len = strlen( jv->bv_val );
 
-               ldap_free_urldesc( url );
+               } else {
+                       ber_dupbv( jv, iv );
+               }
                jv++;
+
+               ldap_free_urldesc( url );
        }
 
-       if( jv == refs ) {
+       if ( jv == refs ) {
                ch_free( refs );
                refs = NULL;
 
        } else {
-               jv->bv_val = NULL;
+               BER_BVZERO( jv );
        }
 
        return refs;
@@ -284,12 +282,7 @@ BerVarray get_entry_referrals(
 
        if( i < 1 ) return NULL;
 
-       refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
-       if( refs == NULL ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
-               return NULL;
-       }
+       refs = ch_malloc( (i + 1) * sizeof(struct berval));
 
        for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
                unsigned k;