From: Howard Chu <hyc@openldap.org>
Date: Sat, 27 May 2006 10:45:32 +0000 (+0000)
Subject: Import ITS#4567 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_24~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ff514fb857ded4fe7f7ef090982cf7fc3d97e8dc;p=openldap

Import ITS#4567 fix from HEAD
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index b3e2f73a80..d5712363c8 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1339,6 +1339,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:
@@ -1751,6 +1752,7 @@ syncrepl_entry(
 		}
 	}
 
+	slap_op_time( &op->o_time, &op->o_tincr );
 	switch ( syncstate ) {
 	case LDAP_SYNC_ADD:
 	case LDAP_SYNC_MODIFY:
@@ -1821,6 +1823,7 @@ retry_add:;
 					be->be_search( &op2, &rs2 );
 
 					retry = 0;
+					slap_op_time( &op->o_time, &op->o_tincr );
 					goto retry_add;
 				}
 				/* FALLTHRU */
@@ -1863,6 +1866,8 @@ retry_add:;
 				ret = 1;
 				goto done;
 			}
+			if ( dni.wasChanged )
+				slap_op_time( &op->o_time, &op->o_tincr );
 		}
 		if ( dni.wasChanged ) {
 			Modifications *mod, *modhead = NULL;