Partial revert of f30269f5d2e4bb5ee7486fe6542078d1b59dba6d

[openldap] / servers / slapd / ldapsync.c

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 6b2babbbf060989d631845ada0b0ae52e120e0f9..bf20388477734109169b3484df70db46184dc068 100644 (file)
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2011 The OpenLDAP Foundation.
+ * Copyright 2003-2012 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -166,6 +166,90 @@ slap_parse_csn_sids( BerVarray csns, int numcsns, void *memctx )
        return ret;
 }
 
+static slap_mr_match_func sidsort_cmp;
+
+static const MatchingRule sidsort_mr = {
+       { 0 },
+       NULL,
+       { 0 },
+       { 0 },
+       0,
+       NULL, NULL, NULL, sidsort_cmp
+};
+static const AttributeType sidsort_at = {
+       { 0 },
+       { 0 },
+       NULL, NULL, (MatchingRule *)&sidsort_mr,
+       NULL, NULL, NULL, NULL, NULL, NULL, NULL, SLAP_AT_SORTED_VAL
+};
+static const AttributeDescription sidsort_ad = {
+       NULL,
+       (AttributeType *)&sidsort_at
+};
+
+static int
+sidsort_cmp(
+       int *matchp,
+       slap_mask_t flags,
+       Syntax *syntax,
+       MatchingRule *mr,
+       struct berval *b1,
+       void *v2 )
+{
+       struct berval *b2 = v2;
+       *matchp = b1->bv_len - b2->bv_len;
+       return LDAP_SUCCESS;
+}
+
+/* sort CSNs by SID. Use a fake Attribute with our own
+ * syntax and matching rule, which sorts the nvals by
+ * bv_len order. Stuff our sids into the bv_len.
+ */
+int
+slap_sort_csn_sids( BerVarray csns, int *sids, int numcsns, void *memctx )
+{
+       Attribute a;
+       const char *text;
+       int i, rc;
+
+       a.a_desc = (AttributeDescription *)&sidsort_ad;
+       a.a_nvals = slap_sl_malloc( numcsns * sizeof(struct berval), memctx );
+       for ( i=0; i<numcsns; i++ ) {
+               a.a_nvals[i].bv_len = sids[i];
+               a.a_nvals[i].bv_val = NULL;
+       }
+       a.a_vals = csns;
+       a.a_numvals = numcsns;
+       a.a_flags = 0;
+       rc = slap_sort_vals( (Modifications *)&a, &text, &i, memctx );
+       for ( i=0; i<numcsns; i++ )
+               sids[i] = a.a_nvals[i].bv_len;
+       slap_sl_free( a.a_nvals, memctx );
+       return rc;
+}
+
+void
+slap_insert_csn_sids(
+       struct sync_cookie *ck,
+       int pos,
+       int sid,
+       struct berval *csn
+)
+{
+       int i;
+       ck->numcsns++;
+       ck->ctxcsn = ch_realloc( ck->ctxcsn,
+               (ck->numcsns+1) * sizeof(struct berval));
+       BER_BVZERO( &ck->ctxcsn[ck->numcsns] );
+       ck->sids = ch_realloc( ck->sids, ck->numcsns * sizeof(int));
+       for ( i = ck->numcsns-1; i > pos; i-- ) {
+               ck->ctxcsn[i] = ck->ctxcsn[i-1];
+               ck->sids[i] = ck->sids[i-1];
+       }
+       ck->sids[i] = sid;
+       ber_dupbv( &ck->ctxcsn[i], csn );
+}
+
 int
 slap_parse_sync_cookie(
        struct sync_cookie *cookie,
@@ -280,6 +364,8 @@ slap_parse_sync_cookie(
        if ( cookie->numcsns ) {
                cookie->sids = slap_parse_csn_sids( cookie->ctxcsn, cookie->numcsns,
                        memctx );
+               if ( cookie->numcsns > 1 )
+                       slap_sort_csn_sids( cookie->ctxcsn, cookie->sids, cookie->numcsns, memctx );
        }
        return 0;
 }