From 427d76612eab4df5d1b9fe534a49eeabc67da04b Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 17 Mar 2009 17:34:54 +0000
Subject: [PATCH] ITS#5973

---
 CHANGES                           | 1 +
 servers/slapd/overlays/syncprov.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 500c354d1a..715e65ec5e 100644
--- 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 f3c6e483db..2fb23d3c3c 100644
--- 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 )) {
-- 
GitLab