From: Luke Howard <lukeh@openldap.org>
Date: Sun, 11 Jun 2006 08:29:07 +0000 (+0000)
Subject: fix previous commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~145
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7ca0a72a3a445a832cd8d8cbfe797c0fb8a46cf4;p=openldap

fix previous commit
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 434d29e643..548e5848e2 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -380,13 +380,12 @@ glue_op_search ( Operation *op, SlapReply *rs )
 				if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
 					gs.err = LDAP_SUCCESS;
 				}
+				op->o_req_dn = dn;
+				op->o_req_ndn = ndn;
 
 			} else if (scope0 == LDAP_SCOPE_SUBTREE &&
 				dn_match(&op->o_bd->be_nsuffix[0], &ndn))
 			{
-				op->ors_scope = LDAP_SCOPE_SUBTREE;
-				op->o_req_dn = dn;
-				op->o_req_ndn = ndn;
 				rs->sr_err = glue_sub_search( op, rs, b0, on );
 
 			} else if (scope0 == LDAP_SCOPE_SUBTREE &&
@@ -402,9 +401,6 @@ glue_op_search ( Operation *op, SlapReply *rs )
 				op->o_req_ndn = ndn;
 
 			} else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) {
-				op->ors_scope = scope0;
-				op->o_req_dn = dn;
-				op->o_req_ndn = ndn;
 				rs->sr_err = glue_sub_search( op, rs, b0, on );
 			}