ITS#5969

diff --git a/CHANGES b/CHANGES
index e7576e55ec83b1e65186e6a69834b1b462d2ef75..a66c8485136f65dd90c39686555cab1adc3702eb 100644 (file)
--- 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 427c9a421d5defe712bc5405fff8542d5e37e2b2..3f9714456e8ddd3d96a3af0036ede2a579f2219a 100644 (file)
--- 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;
                }