Revert 1.274

This commit is contained in:
Howard Chu 2009-05-11 22:26:12 +00:00
parent 7ab16ae6c2
commit 29be892cc1

View File

@ -569,6 +569,10 @@ dn2entry_retry:
#ifdef SLAP_ZONE_ALLOC #ifdef SLAP_ZONE_ALLOC
slap_zn_runlock(bdb->bi_cache.c_zctx, e); slap_zn_runlock(bdb->bi_cache.c_zctx, e);
#endif #endif
if ( e != e_root ) {
bdb_cache_return_entry_r(bdb, e, &lock);
}
e = NULL;
/* select candidates */ /* select candidates */
if ( op->oq_search.rs_scope == LDAP_SCOPE_BASE ) { if ( op->oq_search.rs_scope == LDAP_SCOPE_BASE ) {
@ -591,11 +595,6 @@ cand_retry:
} }
} }
if ( e != e_root ) {
bdb_cache_return_entry_r(bdb, e, &lock);
}
e = NULL;
/* start cursor at beginning of candidates. /* start cursor at beginning of candidates.
*/ */
cursor = 0; cursor = 0;