upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-09 08:23:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#4030 fix alias deref for Finding, fix alias error code propagation.

Browse source
This commit is contained in:
Howard Chu 2005-09-22 21:12:04 +00:00
parent 0951e71df4
commit dd21d3a29f
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
servers/slapd/back-bdb/search.c
View file

@ -64,12 +64,17 @@ static Entry * deref_base (
rs->sr_err = LDAP_ALIAS_DEREF_PROBLEM;
rs->sr_text = "maximum deref depth exceeded";
while (BDB_IDL_N(tmp) < op->o_bd->be_max_deref_depth) {
for (;;) {
/* Remember the last entry we looked at, so we can
* report broken links
*/
*matched = e;
if (BDB_IDL_N(tmp) >= op->o_bd->be_max_deref_depth) {
e = NULL;
break;
}
/* If this is part of a subtree or onelevel search,
* have we seen this ID before? If so, quit.
*/
@ -360,6 +365,9 @@ bdb_search( Operation *op, SlapReply *rs )
ei = &ei_root;
rs->sr_err = LDAP_SUCCESS;
} else {
if ( op->ors_deref & LDAP_DEREF_FINDING ) {
BDB_IDL_ZERO(candidates);
}
dn2entry_retry:
/* get entry with reader lock */
rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei,
@ -388,10 +396,26 @@ dn2entry_retry:
return rs->sr_err;
}
if ( e && (op->ors_deref & LDAP_DEREF_FINDING) && is_entry_alias(e) ) {
BDB_IDL_ZERO(candidates);
e = deref_base( op, rs, e, &matched, locker, &lock,
candidates, NULL );
if ( op->ors_deref & LDAP_DEREF_FINDING ) {
if ( matched && is_entry_alias( matched )) {
struct berval stub;
stub.bv_val = op->o_req_ndn.bv_val;
stub.bv_len = op->o_req_ndn.bv_len - matched->e_nname.bv_len - 1;
e = deref_base( op, rs, matched, &matched, locker, &lock,
candidates, NULL );
if ( e ) {
build_new_dn( &op->o_req_ndn, &e->e_nname, &stub,
op->o_tmpmemctx );
bdb_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache,
e, &lock);
matched = NULL;
goto dn2entry_retry;
}
} else if ( e && is_entry_alias( e )) {
e = deref_base( op, rs, e, &matched, locker, &lock,
candidates, NULL );
}
}
if ( e == NULL ) {
@ -417,7 +441,8 @@ dn2entry_retry:
erefs = is_entry_referral( matched )
? get_entry_referrals( op, matched )
: NULL;
rs->sr_err = LDAP_REFERRAL;
if ( rs->sr_err == DB_NOTFOUND )
rs->sr_err = LDAP_REFERRAL;
rs->sr_matched = matched_dn.bv_val;
}