X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Freferral.c;h=503e1f4558b9237bc5cbd7c831caafe7f8795240;hb=280fc819cf9e8b05efa4df875291af0f20666d40;hp=53edf251fba585d36abccdac5f419b604b499240;hpb=709ce4fa6c0a8aea66c4b6e15bf42aa3352ad2e2;p=openldap

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index 53edf251fb..503e1f4558 100644
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -1,7 +1,7 @@
 /* referral.c - muck with referrals */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -26,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;
@@ -37,14 +37,14 @@ 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 ) {
 		bvin.bv_val = (char *)refDN;
 		bvin.bv_len = strlen( refDN );
 
-		rc = dnPretty2( NULL, &bvin, &nrefDN );
+		rc = dnPretty2( NULL, &bvin, &nrefDN, NULL );
 		if( rc != LDAP_SUCCESS ) {
 			/* Invalid refDN */
 			return NULL;
@@ -56,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, NULL );
 	if( rc != LDAP_SUCCESS ) {
 		/* Invalid targetDN */
 		ch_free( nrefDN.bv_val );
@@ -70,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, NULL );
 		if( rc != LDAP_SUCCESS ) {
 			/* Invalid baseDN */
 			ch_free( nrefDN.bv_val );
@@ -81,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;
@@ -107,7 +101,17 @@ static char * referral_dn_muck(
 			}
 
 			muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
-			muck.bv_val = ch_malloc( muck.bv_len + 1 );
+			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;
+			}
 
 			strncpy( muck.bv_val, ntargetDN.bv_val,
 				ntargetDN.bv_len-nbaseDN.bv_len );
@@ -152,9 +156,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",
@@ -167,9 +171,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",
@@ -179,9 +181,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",
@@ -191,9 +192,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",
@@ -203,9 +203,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",
@@ -236,7 +235,17 @@ BerVarray referral_rewrite(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i+1) * sizeof( struct berval ) );
+	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
+		return NULL;
+	}
 
 	for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
 		LDAPURLDesc *url;
@@ -254,8 +263,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 );
 		}
@@ -284,8 +292,6 @@ BerVarray referral_rewrite(
 
 
 BerVarray get_entry_referrals(
-	Backend *be,
-	Connection *conn,
 	Operation *op,
 	Entry *e )
 {
@@ -306,7 +312,17 @@ BerVarray get_entry_referrals(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i + 1) * sizeof(struct berval));
+	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;
+	}
 
 	for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
 		unsigned k;
@@ -340,3 +356,48 @@ BerVarray get_entry_referrals(
 	return refs;
 }
 
+
+int get_alias_dn(
+	Entry *e,
+	struct berval *ndn,
+	int *err,
+	const char **text )
+{	
+	Attribute *a;
+	AttributeDescription *aliasedObjectName
+		= slap_schema.si_ad_aliasedObjectName;
+
+	a = attr_find( e->e_attrs, aliasedObjectName );
+
+	if( a == NULL ) {
+		/*
+		 * there was an aliasedobjectname defined but no data.
+		 */
+		*err = LDAP_ALIAS_PROBLEM;
+		*text = "alias missing aliasedObjectName attribute";
+		return -1;
+	}
+
+	/* 
+	 * aliasedObjectName should be SINGLE-VALUED with a single value. 
+	 */			
+	if ( a->a_vals[0].bv_val == NULL ) {
+		/*
+		 * there was an aliasedobjectname defined but no data.
+		 */
+		*err = LDAP_ALIAS_PROBLEM;
+		*text = "alias missing aliasedObjectName value";
+		return -1;
+	}
+
+	if( a->a_nvals[1].bv_val != NULL ) {
+		*err = LDAP_ALIAS_PROBLEM;
+		*text = "alias has multivalued aliasedObjectName";
+		return -1;
+	}
+
+	*ndn = a->a_nvals[0];
+
+	return 0;
+}
+