X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Freferral.c;h=4537420f3e54c55a82303a3ff8c30c0b9147c5f0;hb=4361a942abb69d6b3dbae637cddb4055080fe6fa;hp=e9c99c895f9bff4d1474fd8c1ab5c0e01583b46b;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index e9c99c895f..4537420f3e 100644
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,8 +25,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include <ldap_pvt.h>
-
 #include "slap.h"
 
 /*
@@ -40,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 */
@@ -112,13 +110,8 @@ 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;
 			}
 
@@ -160,65 +153,41 @@ 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:
 		/* 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;
 	}
 
@@ -232,68 +201,70 @@ 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;
+	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
+	refs = SLAP_MALLOC( ( i + 1 ) * sizeof( struct berval ) );
+	if ( refs == NULL ) {
 		Debug( LDAP_DEBUG_ANY,
 			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
-#endif
 		return NULL;
 	}
 
-	for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
-		LDAPURLDesc *url;
-		int rc = ldap_url_parse_ext( iv->bv_val, &url );
-
-		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;
@@ -323,13 +294,8 @@ BerVarray get_entry_referrals(
 
 	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;
 	}