From: Howard Chu <hyc@openldap.org>
Date: Sat, 27 May 2006 10:26:15 +0000 (+0000)
Subject: ITS#4567 use unique timestamps for ops for cascading delta-sync
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~209
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=62437022abaca88c2b11ddc2bf3059e373d8ad09;p=openldap

ITS#4567 use unique timestamps for ops for cascading delta-sync
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index de322be98f..e9c1cd18e9 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1350,6 +1350,7 @@ syncrepl_message_to_op(
 	}
 
 	op->o_callback = &cb;
+	slap_op_time( &op->o_time, &op->o_tincr );
 
 	switch( op->o_tag ) {
 	case LDAP_REQ_ADD:
@@ -1770,6 +1771,7 @@ syncrepl_entry(
 		}
 	}
 
+	slap_op_time( &op->o_time, &op->o_tincr );
 	switch ( syncstate ) {
 	case LDAP_SYNC_ADD:
 	case LDAP_SYNC_MODIFY:
@@ -1848,6 +1850,7 @@ retry_add:;
 					if ( rc ) goto done;
 
 					retry = 0;
+					slap_op_time( &op->o_time, &op->o_tincr );
 					goto retry_add;
 				}
 				/* FALLTHRU */
@@ -1893,6 +1896,8 @@ retry_add:;
 			} else {
 				goto done;
 			}
+			if ( dni.wasChanged )
+				slap_op_time( &op->o_time, &op->o_tincr );
 		}
 		if ( dni.wasChanged ) {
 			Modifications *mod, *modhead = NULL;