upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-04 06:01:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More for prev commit - if doing both modrdn and modify at once, only

Browse source 
set the CSN on the modify op.
This commit is contained in:
Howard Chu 2008-12-03 04:49:53 +00:00
parent fe5d21e86c
commit 65530005ee
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/slapd/syncrepl.c
View file

@ -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;