-#else /* LDAP_CACHING */
- if ( op->o_caching_on || nbase->bv_len == 0 ) {
- if (nbase->bv_len == 0) {
- e = (Entry *) &slap_entry_root;
- /* need normalized dn below */
- ber_dupbv( &realbase, &e->e_nname );
- } else {
- if ((scope == LDAP_SCOPE_BASE)
- && (e = dn2entry_r( be, nbase, &matched )))
- {
- candidates = base_candidate(be,e);
- cache_return_entry_r( &li->li_cache, e );
- goto searchit;
- }
- cache_base_entry.e_nname = *nbase;
- e = &cache_base_entry;
- }
-#endif /* LDAP_CACHING */
-
- candidates = search_candidates( be, e, filter,
- scope, deref,
+ candidates = search_candidates( op, e, op->oq_search.rs_filter,
+ op->oq_search.rs_scope, op->oq_search.rs_deref,