ITS#5503

ITS#5465

diff --git a/CHANGES b/CHANGES
index 0dd2884db950d91a6236b68095b52432dc9c0b49..9b0f7969af58c1d71c017dfb74f8c96f27c283b4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.10 Engineering
        Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
        Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493)
        Fixed slapo-syncprov op2.o_extra reset (ITS#5506)
+       Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465)
 
 OpenLDAP 2.4.9 Release (2008/05/07)
        Fixed libldap to use unsigned port (ITS#5436)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 01602a79fa39a0d00f85fa14c19c698a3e2fea98..a776229b7dd8ec51cbf23686864b0763164262ef 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1619,6 +1619,10 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                                        sizeof(int));
                                si->si_sids[i] = sid;
                        }
+               } else {
+                       /* internal ops that aren't meant to be replicated */
+                       ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
+                       return SLAP_CB_CONTINUE;
                }
 
                /* Don't do any processing for consumer contextCSN updates */