Commit 7c284206 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#7303 fix unneeded alias lookups

parent c73ec150
......@@ -184,7 +184,7 @@ static int search_aliases(
BDB_IDL_ZERO( aliases );
rs->sr_err = bdb_filter_candidates( op, txn, &af, aliases,
curscop, visited );
if (rs->sr_err != LDAP_SUCCESS) {
if (rs->sr_err != LDAP_SUCCESS || BDB_IDL_IS_ZERO( aliases )) {
return rs->sr_err;
}
oldsubs[0] = 1;
......@@ -1253,6 +1253,8 @@ static int search_candidates(
if( op->ors_deref & LDAP_DEREF_SEARCHING ) {
rc = search_aliases( op, rs, e, txn, ids, scopes, stack );
if ( BDB_IDL_IS_ZERO( ids ))
rc = bdb_dn2idl( op, txn, &e->e_nname, BEI(e), ids, stack );
} else {
rc = bdb_dn2idl( op, txn, &e->e_nname, BEI(e), ids, stack );
}
......
......@@ -160,7 +160,7 @@ static int search_aliases(
MDB_IDL_ZERO( aliases );
rs->sr_err = mdb_filter_candidates( op, txn, &af, aliases,
curscop, visited );
if (rs->sr_err != LDAP_SUCCESS) {
if (rs->sr_err != LDAP_SUCCESS || MDB_IDL_IS_ZERO( aliases )) {
return rs->sr_err;
}
oldsubs[0] = 1;
......
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