From: Howard Chu <hyc@openldap.org>
Date: Fri, 30 Sep 2011 07:09:01 +0000 (-0700)
Subject: ITS#7052 syncrepl deletes need a non-empty CSN
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~244
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=970244fe1d19de631876a0a7d57edc816c53016b;p=openldap

ITS#7052 syncrepl deletes need a non-empty CSN

Must not let the underlying DB generate its own.
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 0c4bb5b978..af10aee043 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2817,9 +2817,7 @@ syncrepl_entry(
 				/* FIXME: op->o_csn is assumed to be
 				 * on the thread's slab; this needs
 				 * to be cleared ASAP.
-				 * What happens if already present?
 				 */
-				assert( BER_BVISNULL( &op->o_csn ) );
 				op->o_csn = a->a_vals[0];
 				freecsn = 0;
 			}
@@ -3160,6 +3158,9 @@ retry_modrdn:;
 			op->o_req_ndn = dni.ndn;
 			op->o_tag = LDAP_REQ_DELETE;
 			op->o_bd = si->si_wbe;
+			if ( !syncCSN ) {
+				slap_queue_csn( op, si->si_syncCookie.ctxcsn );
+			}
 			rc = op->o_bd->be_delete( op, &rs_delete );
 			Debug( LDAP_DEBUG_SYNC,
 					"syncrepl_entry: %s be_delete %s (%d)\n",