From cfc5c7cc68e51c341d696f2d1732108579e6bfbc Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 10 Mar 2008 19:28:40 +0000 Subject: [PATCH] ITS#5339: fix referral rewrite, remove pointless default_referral code --- servers/slapd/back-bdb/referral.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c index b2b2c68f5b..80b193f169 100644 --- a/servers/slapd/back-bdb/referral.c +++ b/servers/slapd/back-bdb/referral.c @@ -93,7 +93,7 @@ dn2entry_retry: if( is_entry_referral( e ) ) { BerVarray ref = get_entry_referrals( op, e ); rc = LDAP_OTHER; - rs->sr_ref = referral_rewrite( ref, NULL, + rs->sr_ref = referral_rewrite( ref, &e->e_name, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); ber_bvarray_free( ref ); if ( rs->sr_ref ) { @@ -104,10 +104,6 @@ dn2entry_retry: bdb_cache_return_entry_r (bdb, e, &lock); e = NULL; - } else if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) && default_referral != NULL ) { - rc = LDAP_OTHER; - rs->sr_ref = referral_rewrite( default_referral, - NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); } if( rs->sr_ref != NULL ) {