ITS#5973

diff --git a/CHANGES b/CHANGES
index 500c354d1af4593616b31ffda994e49455f3e5cc..715e65ec5e0ae29f49d79a33baad65f54faa0b37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ OpenLDAP 2.4.16 Engineering
        Fixed slapd-syncprov too many MMR messages (ITS#6020)
        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 skipped entries with MMR (ITS#5988)
        Build Environment
                Cleaned up alloc/free functions for Windows (ITS#6005)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index f3c6e483db39afee80d7da30b297fe101cde9265..2fb23d3c3cdb2337570503525751575163908da2 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1644,7 +1644,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                maxcsn.bv_len = sizeof(cbuf);
                ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
 
-#if 0
                if ( op->o_dont_replicate &&
                                op->orm_modlist->sml_op == LDAP_MOD_REPLACE &&
                                op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
@@ -1694,7 +1693,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                        }
                        return SLAP_CB_CONTINUE;
                }
-#endif
 
                slap_get_commit_csn( op, &maxcsn, &foundit );
                if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {