From 65530005ee9a15ea06e861e44e43b6269d304daa Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 3 Dec 2008 04:49:53 +0000 Subject: [PATCH] More for prev commit - if doing both modrdn and modify at once, only set the CSN on the modify op. --- servers/slapd/syncrepl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index eaccc3785e..f7cf7eb0f5 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -2208,7 +2208,7 @@ retry_add:; if ( dni.renamed ) { struct berval noldp, newp; Modifications *mod, **modtail, **ml, *m2; - int i, got_replace = 0; + int i, got_replace = 0, just_rename = 0; op->o_tag = LDAP_REQ_MODRDN; dnRdn( &entry->e_name, &op->orr_newrdn ); @@ -2368,8 +2368,12 @@ retry_add:; */ if ( dni.mods ) { mod = dni.mods; + /* don't set a CSN for the rename op */ + if ( syncCSN ) + slap_graduate_commit_csn( op ); } else { mod = op->orr_modlist; + just_rename = 1; } for ( ; mod->sml_next; mod=mod->sml_next ); mod->sml_next = m2; @@ -2387,6 +2391,9 @@ retry_add:; /* Renamed entries may still have other mods so just fallthru */ op->o_req_dn = entry->e_name; op->o_req_ndn = entry->e_nname; + /* Use CSN on the modify */ + if ( syncCSN && !just_rename ) + slap_queue_csn( op, syncCSN ); } if ( dni.mods ) { op->o_tag = LDAP_REQ_MODIFY; -- 2.39.5