From: Howard Chu <hyc@openldap.org>
Date: Thu, 20 Mar 2008 00:31:42 +0000 (+0000)
Subject: ITS#5434 search thru other overlays when present
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=261d2420f49c63f2a79d1e24d5887c0d4ef2b618;p=openldap

ITS#5434 search thru other overlays when present
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index af8ad727ec..0bc2d38063 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -696,7 +696,10 @@ again:
 		break;
 	}
 
-	fop.o_bd->bd_info = on->on_info->oi_orig;
+	if ( on->on_next )
+		fop.o_bd->bd_info = (BackendInfo *)on->on_next;
+	else
+		fop.o_bd->bd_info = on->on_info->oi_orig;
 	fop.o_bd->be_search( &fop, &frs );
 	fop.o_bd->bd_info = (BackendInfo *)on;
 
@@ -1528,7 +1531,10 @@ syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl,
 		fop.ors_filter = &af;
 
 		cb.sc_response = playlog_cb;
-		fop.o_bd->bd_info = on->on_info->oi_orig;
+		if ( on->on_next )
+			fop.o_bd->bd_info = (BackendInfo *)on->on_next;
+		else
+			fop.o_bd->bd_info = on->on_info->oi_orig;
 
 		for ( i=ndel; i<num; i++ ) {
 			if ( uuids[i].bv_len == 0 ) continue;