Commit 3bf9998d authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5339

parent b4c9dea7
...@@ -24,6 +24,7 @@ OpenLDAP 2.4.9 Engineering ...@@ -24,6 +24,7 @@ OpenLDAP 2.4.9 Engineering
Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442) Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442)
Fixed slapd-bdb ID_NOCACHE handling (ITS#5439) Fixed slapd-bdb ID_NOCACHE handling (ITS#5439)
Fixed slapd-bdb entryinfo state if db_lock fails (ITS#5455) 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-config attribute publishing (ITS#5383)
Fixed slapd-ldap connection handler (ITS#5404) Fixed slapd-ldap connection handler (ITS#5404)
Fixed slapd-meta connections on error (ITS#5440) Fixed slapd-meta connections on error (ITS#5440)
......
...@@ -93,7 +93,7 @@ dn2entry_retry: ...@@ -93,7 +93,7 @@ dn2entry_retry:
if( is_entry_referral( e ) ) { if( is_entry_referral( e ) ) {
BerVarray ref = get_entry_referrals( op, e ); BerVarray ref = get_entry_referrals( op, e );
rc = LDAP_OTHER; 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 ); &op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref ); ber_bvarray_free( ref );
if ( rs->sr_ref ) { if ( rs->sr_ref ) {
...@@ -104,10 +104,6 @@ dn2entry_retry: ...@@ -104,10 +104,6 @@ dn2entry_retry:
bdb_cache_return_entry_r (bdb, e, &lock); bdb_cache_return_entry_r (bdb, e, &lock);
e = NULL; 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 ) { if( rs->sr_ref != NULL ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment