X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Freferral.c;h=e9b187a734c76bf5bff6283ee882cae4cdf66a38;hb=b4e1ea15f3081a065318f5ee99336494c8765bca;hp=1293c32a354951aa2c58b5b4b88b9f7a85925ad5;hpb=3bfab4699e19d4d7595c129b89d0dd2048e812bc;p=openldap

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index 1293c32a35..e9b187a734 100644
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -11,7 +11,6 @@
 
 #include <ac/socket.h>
 #include <ac/errno.h>
-#include <ac/signal.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
 #include <ac/time.h>
@@ -27,8 +26,8 @@
  */
 static char * referral_dn_muck(
 	const char * refDN,
-	const char * baseDN,
-	const char * targetDN )
+	struct berval * baseDN,
+	struct berval * targetDN )
 {
 	int rc;
 	struct berval bvin;
@@ -38,7 +37,7 @@ static char * referral_dn_muck(
 
 	if( !baseDN ) {
 		/* no base, return target */
-		return targetDN ? ch_strdup( targetDN ) : NULL;
+		return targetDN ? ch_strdup( targetDN->bv_val ) : NULL;
 	}
 
 	if( refDN ) {
@@ -57,13 +56,10 @@ static char * referral_dn_muck(
 		 *	if refDN present return refDN
 		 *  else return baseDN
 		 */
-		return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN );
+		return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN->bv_val );
 	}
 
-	bvin.bv_val = (char *)targetDN;
-	bvin.bv_len = strlen( targetDN );
-
-	rc = dnPretty2( NULL, &bvin, &ntargetDN );
+	rc = dnPretty2( NULL, targetDN, &ntargetDN );
 	if( rc != LDAP_SUCCESS ) {
 		/* Invalid targetDN */
 		ch_free( nrefDN.bv_val );
@@ -71,10 +67,7 @@ static char * referral_dn_muck(
 	}
 
 	if( nrefDN.bv_len ) {
-		bvin.bv_val = (char *)baseDN;
-		bvin.bv_len = strlen( baseDN );
-
-		rc = dnPretty2( NULL, &bvin, &nbaseDN );
+		rc = dnPretty2( NULL, baseDN, &nbaseDN );
 		if( rc != LDAP_SUCCESS ) {
 			/* Invalid baseDN */
 			ch_free( nrefDN.bv_val );
@@ -82,7 +75,7 @@ static char * referral_dn_muck(
 			return NULL;
 		}
 
-		if( dn_match( &nbaseDN, &nrefDN ) == 0 ) {
+		if( dn_match( &nbaseDN, &nrefDN ) ) {
 			ch_free( nrefDN.bv_val );
 			ch_free( nbaseDN.bv_val );
 			return ntargetDN.bv_val;
@@ -153,9 +146,9 @@ int validate_global_referral( const char *url )
 	default:
 		/* other error, bail */
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+		LDAP_LOG( CONFIG, CRIT, 
 			"referral: invalid URL (%s): %s (%d)\n",
-			url, "" /* ldap_url_error2str(rc) */, rc ));
+			url, "" /* ldap_url_error2str(rc) */, rc );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: invalid URL (%s): %s (%d)\n",
@@ -168,9 +161,7 @@ int validate_global_referral( const char *url )
 
 	if( lurl->lud_dn && *lurl->lud_dn ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-			"referral: URL (%s): contains DN\n",
-			url ));
+		LDAP_LOG( CONFIG, CRIT, "referral: URL (%s): contains DN\n", url, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): contains DN\n",
@@ -180,9 +171,8 @@ int validate_global_referral( const char *url )
 
 	} else if( lurl->lud_attrs ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-			"referral: URL (%s): requests attributes\n",
-			url ));
+		LDAP_LOG( CONFIG, CRIT, 
+			"referral: URL (%s): requests attributes\n", url, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"referral: URL (%s): requests attributes\n",
@@ -192,9 +182,8 @@ int validate_global_referral( const char *url )
 
 	} else if( lurl->lud_scope != LDAP_SCOPE_DEFAULT ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-			"referral: URL (%s): contains explicit scope\n",
-			url ));
+		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",
@@ -204,9 +193,8 @@ int validate_global_referral( const char *url )
 
 	} else if( lurl->lud_filter ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-			"referral: URL (%s): contains explicit filter\n",
-			url ));
+		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",
@@ -255,8 +243,7 @@ BerVarray referral_rewrite(
 			char *dn = url->lud_dn;
 			url->lud_dn = referral_dn_muck(
 				( dn && *dn ) ? dn : NULL,
-				base ? base->bv_val : NULL,
-				target ? target->bv_val : NULL ); 
+				base, target );
 
 			ldap_memfree( dn );
 		}
@@ -315,7 +302,7 @@ BerVarray get_entry_referrals(
 
 		/* trim the label */
 		for( k=0; k<jv->bv_len; k++ ) {
-			if( isspace(jv->bv_val[k]) ) {
+			if( isspace( (unsigned char) jv->bv_val[k] ) ) {
 				jv->bv_val[k] = '\0';
 				jv->bv_len = k;
 				break;