upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-16 00:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix syncrepl_entry to propagate cookieCSN when present

Browse source
This commit is contained in:
Howard Chu 2007-10-05 09:03:44 +00:00
parent 7c6c734226
commit 3a1b56192d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/syncrepl.c
View file

@ -112,7 +112,8 @@ static int syncrepl_message_to_entry(
Modifications **, Entry **, int );
static int syncrepl_entry(
syncinfo_t *, Operation*, Entry*,
Modifications**,int, struct berval* );
Modifications**,int, struct berval*,
struct berval *cookieCSN );
static int syncrepl_updateCookie(
syncinfo_t *, Operation *, struct berval *,
struct sync_cookie * );
@ -821,7 +822,7 @@ do_syncrep2(
&modlist, &entry, syncstate ) ) == LDAP_SUCCESS )
{
if ( ( rc = syncrepl_entry( si, op, entry, &modlist,
syncstate, &syncUUID ) ) == LDAP_SUCCESS &&
syncstate, &syncUUID, syncCookie.ctxcsn ) ) == LDAP_SUCCESS &&
syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
@ -1861,7 +1862,8 @@ syncrepl_entry(
Entry* entry,
Modifications** modlist,
int syncstate,
struct berval* syncUUID )
struct berval* syncUUID,
struct berval* syncCSN )
{
Backend *be = op->o_bd;
slap_callback cb = { NULL, NULL, NULL, NULL };
@ -1986,12 +1988,17 @@ syncrepl_entry(
}
assert( BER_BVISNULL( &op->o_csn ) );
if ( syncCSN ) {
slap_queue_csn( op, syncCSN );
}
slap_op_time( &op->o_time, &op->o_tincr );
switch ( syncstate ) {
case LDAP_SYNC_ADD:
case LDAP_SYNC_MODIFY:
if ( BER_BVISNULL( &op->o_csn ))
{
Attribute *a = attr_find( entry->e_attrs, slap_schema.si_ad_entryCSN );
if ( a ) {
/* FIXME: op->o_csn is assumed to be
@ -2237,6 +2244,9 @@ done:
if ( entry ) {
entry_free( entry );
}
if ( syncCSN ) {
slap_graduate_commit_csn( op );
}
if ( !BER_BVISNULL( &op->o_csn ) && freecsn ) {
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
}