ITS#5339

diff --git a/CHANGES b/CHANGES
index 76faaceb79ef2e13f1ca0cb565cc16217888366d..94df2650bdb2205ec6780e6cdef2fc7bf022b3e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442)
        Fixed slapd-bdb ID_NOCACHE handling (ITS#5439)
        Fixed slapd-bdb entryinfo state if db_lock fails (ITS#5455)
+       Fixed slapd-bdb referral rewrite (ITS#5339)
        Fixed slapd-config attribute publishing (ITS#5383)
        Fixed slapd-ldap connection handler (ITS#5404)
        Fixed slapd-meta connections on error (ITS#5440)

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index b2b2c68f5b11c6822b859b68838fc83d5265cb7c..80b193f169e7635c7ed8a5f1e4f4080954994f73 100644 (file)
--- 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 ) {