X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Freferral.c;h=efa710036789ed6c2ef0e25d71f4e09c545ad104;hb=4b310215896250168176f06e1ba7e073746b1b51;hp=503e1f4558b9237bc5cbd7c831caafe7f8795240;hpb=ece7452b05fcbbb14823e113b683365a59f81f05;p=openldap

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index 503e1f4558..efa7100367 100644
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -1,8 +1,17 @@
 /* referral.c - muck with referrals */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -16,8 +25,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include <ldap_pvt.h>
-
 #include "slap.h"
 
 /*
@@ -31,9 +38,9 @@ static char * referral_dn_muck(
 {
 	int rc;
 	struct berval bvin;
-	struct berval nrefDN = { 0, NULL };
-	struct berval nbaseDN = { 0, NULL };
-	struct berval ntargetDN = { 0, NULL };
+	struct berval nrefDN = BER_BVNULL;
+	struct berval nbaseDN = BER_BVNULL;
+	struct berval ntargetDN = BER_BVNULL;
 
 	if( !baseDN ) {
 		/* no base, return target */
@@ -44,7 +51,7 @@ static char * referral_dn_muck(
 		bvin.bv_val = (char *)refDN;
 		bvin.bv_len = strlen( refDN );
 
-		rc = dnPretty2( NULL, &bvin, &nrefDN, NULL );
+		rc = dnPretty( NULL, &bvin, &nrefDN, NULL );
 		if( rc != LDAP_SUCCESS ) {
 			/* Invalid refDN */
 			return NULL;
@@ -59,7 +66,7 @@ static char * referral_dn_muck(
 		return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN->bv_val );
 	}
 
-	rc = dnPretty2( NULL, targetDN, &ntargetDN, NULL );
+	rc = dnPretty( NULL, targetDN, &ntargetDN, NULL );
 	if( rc != LDAP_SUCCESS ) {
 		/* Invalid targetDN */
 		ch_free( nrefDN.bv_val );
@@ -67,7 +74,7 @@ static char * referral_dn_muck(
 	}
 
 	if( nrefDN.bv_len ) {
-		rc = dnPretty2( NULL, baseDN, &nbaseDN, NULL );
+		rc = dnPretty( NULL, baseDN, &nbaseDN, NULL );
 		if( rc != LDAP_SUCCESS ) {
 			/* Invalid baseDN */
 			ch_free( nrefDN.bv_val );
@@ -101,17 +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 ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT, 
-					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
-#else
-				Debug( LDAP_DEBUG_ANY,
-					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
-#endif
-				return NULL;
-			}
+			muck.bv_val = ch_malloc( muck.bv_len + 1 );
 
 			strncpy( muck.bv_val, ntargetDN.bv_val,
 				ntargetDN.bv_len-nbaseDN.bv_len );
@@ -155,61 +152,36 @@ int validate_global_referral( const char *url )
 
 	default:
 		/* other error, bail */
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, CRIT, 
-			"referral: invalid URL (%s): %s (%d)\n",
-			url, "" /* ldap_url_error2str(rc) */, rc );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: invalid URL (%s): %s (%d)\n",
 			url, "" /* ldap_url_error2str(rc) */, rc );
-#endif
 		return 1;
 	}
 
 	rc = 0;
 
 	if( lurl->lud_dn && *lurl->lud_dn ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, CRIT, "referral: URL (%s): contains DN\n", url, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): contains DN\n",
 			url, 0, 0 );
-#endif
 		rc = 1;
 
 	} else if( lurl->lud_attrs ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, CRIT, 
-			"referral: URL (%s): requests attributes\n", url, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): requests attributes\n",
 			url, 0, 0 );
-#endif
 		rc = 1;
 
 	} else if( lurl->lud_scope != LDAP_SCOPE_DEFAULT ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, CRIT, 
-			"referral: URL (%s): contains explicit scope\n", url, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): contains explicit scope\n",
 			url, 0, 0 );
-#endif
 		rc = 1;
 
 	} else if( lurl->lud_filter ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, CRIT, 
-			"referral: URL (%s): contains explicit filter\n", url, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): contains explicit filter\n",
 			url, 0, 0 );
-#endif
 		rc = 1;
 	}
 
@@ -223,68 +195,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 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, CRIT, 
-			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_ANY,
-			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
-#endif
+	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 );
+		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;
@@ -312,17 +281,7 @@ BerVarray get_entry_referrals(
 
 	if( i < 1 ) return NULL;
 
-	refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
-	if( refs == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, CRIT, 
-			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_ANY,
-			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
-#endif
-		return NULL;
-	}
+	refs = ch_malloc( (i + 1) * sizeof(struct berval));
 
 	for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
 		unsigned k;