From 3e8b6ae6ae8d9bacd700dc2a62fdf6e53214ca91 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 23 Feb 2009 03:15:32 +0000 Subject: [PATCH] ITS#5969 --- CHANGES | 1 + servers/slapd/overlays/syncprov.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e7576e55ec..a66c848513 100644 --- a/CHANGES +++ b/CHANGES @@ -13,6 +13,7 @@ OpenLDAP 2.4.15 Release (2009/02/19) Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959) Fixed slapd-relay control initialization (ITS#5724) Fixed slapo-pcache caching invalid entries (ITS#5927) + Fixed slapo-syncprov csn updates (ITS#5969) Fixed slapo-rwm objectClass preservation (ITS#5760) Fixed slapo-rwm rwm_bva_rewrite handling (ITS#5960) Build Environment diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 427c9a421d..3f9714456e 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1630,7 +1630,7 @@ syncprov_op_response( Operation *op, SlapReply *rs ) { struct berval maxcsn; char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; - int do_check = 0, have_psearches, foundit; + int do_check = 0, have_psearches, foundit, csn_changed = 0; /* Update our context CSN */ cbuf[0] = '\0'; @@ -1662,6 +1662,7 @@ syncprov_op_response( Operation *op, SlapReply *rs ) if ( sid == si->si_sids[i] ) { if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn[i] ) > 0 ) { ber_bvreplace( &si->si_ctxcsn[i], &maxcsn ); + csn_changed = 1; } break; } @@ -1669,6 +1670,7 @@ syncprov_op_response( Operation *op, SlapReply *rs ) /* It's a new SID for us */ if ( i == si->si_numcsns ) { value_add_one( &si->si_ctxcsn, &maxcsn ); + csn_changed = 1; si->si_numcsns++; si->si_sids = ch_realloc( si->si_sids, si->si_numcsns * sizeof(int)); @@ -1710,8 +1712,8 @@ syncprov_op_response( Operation *op, SlapReply *rs ) ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock ); } - /* only update consumer ctx if this is the greatest csn */ - if ( bvmatch( &maxcsn, &op->o_csn )) { + /* only update consumer ctx if this is a newer csn */ + if ( csn_changed ) { opc->sctxcsn = maxcsn; } -- 2.39.2