upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-22 14:53:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More tweaks for delta-mmr

Browse source
This commit is contained in:
Howard Chu 2011-06-20 04:27:11 -07:00
parent 67bbad6e70
commit 480f0c16ff
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/syncrepl.c
View file

@ -2010,8 +2010,13 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
overlay_entry_release_ov( op, e, 0, on );
}
/* mod is newer, let it go */
if ( match > 0 )
if ( match > 0 ) {
for ( mod = op->orm_modlist; mod; mod=mod->sml_next ) {
if ( mod->sml_op == LDAP_MOD_DELETE )
mod->sml_op = SLAP_MOD_SOFTDEL;
}
return SLAP_CB_CONTINUE;
}
/* equal? Should never happen */
if ( match == 0 )
return LDAP_SUCCESS;
@ -2067,15 +2072,13 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
op2.ors_attrsonly = 0;
bv = mod->sml_nvalues[0];
ptr = strchr(bv.bv_val, '.');
bv.bv_len = ptr - bv.bv_val;
size = sizeof("(&(reqStart>=)(reqDN=))");
size = sizeof("(&(entryCSN>=)(reqDN=))");
size += bv.bv_len + op->o_req_ndn.bv_len + si->si_logfilterstr.bv_len;
op2.ors_filterstr.bv_val = op->o_tmpalloc( size, op->o_tmpmemctx );
op2.ors_filterstr.bv_len = sprintf(op2.ors_filterstr.bv_val,
"(&(reqStart>=%.*s)(reqDN=%s)%s)",
(int)bv.bv_len, bv.bv_val, op->o_req_ndn.bv_val, si->si_logfilterstr.bv_val );
"(&(entryCSN>=%s)(reqDN=%s)%s)",
bv.bv_val, op->o_req_ndn.bv_val, si->si_logfilterstr.bv_val );
op2.ors_filter = str2filter_x( op, op2.ors_filterstr.bv_val );
op2.o_callback = &cb;
@ -2106,6 +2109,7 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
}
}
op->orm_modlist = newlist;
op->o_csn = mod->sml_nvalues[0];
}
return SLAP_CB_CONTINUE;
}