From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Nov 2007 01:34:01 +0000 (+0000)
Subject: Fix previous commit, broke test033 (related to ITS#5191 fix)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_7~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4cf575124c284ae79f82311e5800ddca3e0edf42;p=openldap

Fix previous commit, broke test033 (related to ITS#5191 fix)
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index f91f195910..62b1600ec1 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -346,7 +346,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
 	slap_overinst	*on = (slap_overinst *)op->o_bd->bd_info;
 	glueinfo		*gi = (glueinfo *)on->on_bi.bi_private;
 	BackendDB *b0 = op->o_bd;
-	BackendDB *btmp;
+	BackendDB *b1 = NULL, *btmp;
 	BackendInfo *bi0 = op->o_bd->bd_info;
 	int i;
 	long stoptime = 0, starttime;
@@ -385,6 +385,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
 		tlimit0 = op->ors_tlimit;
 		dn = op->o_req_dn;
 		ndn = op->o_req_ndn;
+		b1 = op->o_bd;
 
 		/*
 		 * Execute in reverse order, most specific first 
@@ -399,9 +400,9 @@ glue_op_search ( Operation *op, SlapReply *rs )
 			}
 			if (!btmp || !btmp->be_search)
 				continue;
-			if (!dnIsSuffix(&btmp->be_nsuffix[0], &b0->be_nsuffix[0]))
+			if (!dnIsSuffix(&btmp->be_nsuffix[0], &b1->be_nsuffix[0]))
 				continue;
-			if (get_no_subordinate_glue(op) && btmp != b0)
+			if (get_no_subordinate_glue(op) && btmp != b1)
 				continue;
 			/* If we remembered which backend we were on before,
 			 * skip down to it now