ITS#5954

diff --git a/CHANGES b/CHANGES
index bac96ae2f70a11ed5595b19ffb0fcd7753b4ec91..ed22a52b2a41c5893dc913149b12b2f0a86651d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.15 Engineering
        Fixed libldap GnuTLS compilation (ITS#5955)
        Fixed slapd corrupt contextCSN (ITS#5947)
+       Fixed slapd syncrepl order to match on add/delete (ITS#5954)
        Fixed slapo-rwm objectClass preservation (ITS#5760)
 
 OpenLDAP 2.4.14 Release (2009/02/14)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index d99af0ef2ef67b2ba2fc931ba9a8fa06278e4f17..b6686958f323176b4b13c40b5c10de8687f1e73e 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -4325,13 +4325,22 @@ add_syncrepl(
                        BER_BVISNULL( &si->si_bindconf.sb_uri ) ?
                        "(null)" : si->si_bindconf.sb_uri.bv_val, 0, 0 );
                if ( c->be->be_syncinfo ) {
+                       syncinfo_t *sip;
+
                        si->si_cookieState = c->be->be_syncinfo->si_cookieState;
+
+                       // add new syncrepl to end of list (same order as when deleting)
+                       for ( sip = c->be->be_syncinfo; sip->si_next; sip = sip->si_next );
+                       sip->si_next = si;
                } else {
                        si->si_cookieState = ch_calloc( 1, sizeof( cookie_state ));
                        ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_mutex );
+
+                       c->be->be_syncinfo = si;
                }
-               si->si_next = c->be->be_syncinfo;
-               c->be->be_syncinfo = si;
+
+               si->si_next = NULL;
+
                return 0;
        }
 }