ITS#5487

diff --git a/CHANGES b/CHANGES
index e53b128f8c5a84449fc498718badad5136d2bedc..228943c76d26f1e0c78af1693564310e8f6f8a53 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ OpenLDAP 2.4.10 Engineering
        Fixed slapo-refint to allow setting modifiers name (ITS#5505)
        Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493)
        Fixed slapo-syncprov op2.o_extra reset (ITS#5501, #5506)
+       Fixed slapo-syncprov searching wrong backend (ITS#5487)
        Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465)
        Fixed slapo-unique config structs (ITS#5526)
        Fixed slapo-unique filter terminator (ITS#5511)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index a776229b7dd8ec51cbf23686864b0763164262ef..7209b7d473fa0e40f684c9702059f58dfd9c6a79 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -404,7 +404,6 @@ syncprov_findbase( Operation *op, fbase_cookie *fc )
                slap_callback cb = {0};
                Operation fop;
                SlapReply frs = { REP_RESULT };
-               BackendInfo *bi;
                int rc;
 
                fc->fss->s_flags ^= PS_FIND_BASE;
@@ -412,11 +411,10 @@ syncprov_findbase( Operation *op, fbase_cookie *fc )
 
                fop = *fc->fss->s_op;
 
+               fop.o_bd = fop.o_bd->bd_self;
                fop.o_hdr = op->o_hdr;
-               fop.o_bd = op->o_bd;
                fop.o_time = op->o_time;
                fop.o_tincr = op->o_tincr;
-               bi = op->o_bd->bd_info;
 
                cb.sc_response = findbase_cb;
                cb.sc_private = fc;
@@ -434,8 +432,7 @@ syncprov_findbase( Operation *op, fbase_cookie *fc )
                fop.ors_filter = &generic_filter;
                fop.ors_filterstr = generic_filterstr;
 
-               rc = overlay_op_walk( &fop, &frs, op_search, on->on_info, on );
-               op->o_bd->bd_info = bi;
+               rc = fop.o_bd->be_search( &fop, &frs );
        } else {
                ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );
                fc->fbase = 1;