From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 31 Mar 2003 14:01:34 +0000 (+0000)
Subject: new API cleanup in proxy cache code
X-Git-Tag: AUTOCONF_2_57~139
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8da20c6f81c7e014154ae88baf53fe70c2cdbf6f;p=openldap

new API cleanup in proxy cache code
---

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 83f2a53257..62fdb4521a 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -73,14 +73,14 @@ ldbm_back_search(
 		    /* need normalized dn below */
 		    ber_dupbv( &realbase, &e->e_nname );
 		} else {
-			if ((scope == LDAP_SCOPE_BASE) 
-    					&& (e = dn2entry_r( op->o_bd, &op->o_req_ndn &matched )))
+			if ((op->oq_search.rs_scope == LDAP_SCOPE_BASE) 
+    					&& (e = dn2entry_r( op->o_bd, &op->o_req_ndn, &matched )))
     			{
-				candidates = base_candidate(op->o_bd,e);
+				candidates = base_candidate(op->o_bd, e);
 				cache_return_entry_r( &li->li_cache, e );
 				goto searchit;
     			}
-    			cache_base_entry.e_nname = *nbase;
+    			cache_base_entry.e_nname = op->o_req_ndn;
     			e = &cache_base_entry;
 		}
 #endif /* LDAP_CACHING */