ITS#6045

diff --git a/CHANGES b/CHANGES
index a13559ee9ca0fdc724b024c3dc3a4c81420b634b..ad7db56b289a0f482b692f26c00919ebf75cb494 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ OpenLDAP 2.4.16 Release (2009/03/20)
        Fixed slapo-syncprov replica lockout (ITS#5985)
        Fixed slapo-syncprov modtarget tracking (ITS#5999)
        Fixed slapo-syncprov multiple CSN propagation (ITS#5973)
+       Fixed slapo-syncprov race condition (ITS#6045)
        Fixed slapo-syncprov sending cookies without CSN (ITS#6024)
        Fixed slapo-syncprov skipped entries with MMR (ITS#5988)
        Fixed tools passphrase free (ITS#6014)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index d4bbeaab4fbc992fcc13c96bd5e97703957fa641..ddb060d88831df6335f18e6584edcabaedffbaee 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1252,8 +1252,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        oh = *op->o_hdr;
                        oh.oh_conn = ss->s_op->o_conn;
                        oh.oh_connid = ss->s_op->o_connid;
+                       op2.o_bd = op->o_bd->bd_self;
                        op2.o_hdr = &oh;
                        op2.o_extra = op->o_extra;
+                       op2.o_callback = NULL;
                        rc = test_filter( &op2, e, ss->s_op->ors_filter );
                }