]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/ldapsync.c
Add ldap_pvt_thread_pool_retract() to cancel pending threads
[openldap] / servers / slapd / ldapsync.c
index 1cad64cab20c03b0d5d60b4066f2242ae93811e1..f71bedaf45fdd18f831a3a4a94f0429c3a91916d 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 #include "../../libraries/liblber/lber-int.h" /* get ber_strndup() */
 #include "lutil_ldap.h"
 
-#if 0
-struct sync_cookie *slap_sync_cookie = NULL;
-#else
 struct slap_sync_cookie_s slap_sync_cookie =
        LDAP_STAILQ_HEAD_INITIALIZER( slap_sync_cookie );
-#endif
 
-int
-slap_build_sync_state_ctrl(
-       Operation       *op,
-       SlapReply       *rs,
-       Entry           *e,
-       int                     entry_sync_state,
-       LDAPControl     **ctrls,
-       int                     num_ctrls,
-       int                     send_cookie,
-       struct berval   *cookie)
-{
-       Attribute* a;
-       int ret;
-       int res;
-       const char *text = NULL;
-
-       BerElementBuffer berbuf;
-       BerElement *ber = (BerElement *)&berbuf;
-
-       struct berval entryuuid_bv      = BER_BVNULL;
-
-       ber_init2( ber, 0, LBER_USE_DER );
-       ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
-
-       ctrls[num_ctrls] = slap_sl_malloc ( sizeof ( LDAPControl ), op->o_tmpmemctx );
-
-       for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               AttributeDescription *desc = a->a_desc;
-               if ( desc == slap_schema.si_ad_entryUUID ) {
-                       ber_dupbv( &entryuuid_bv, &a->a_nvals[0] );
-               }
-       }
-
-       if ( send_cookie && cookie ) {
-               ber_printf( ber, "{eOON}",
-                       entry_sync_state, &entryuuid_bv, cookie );
-       } else {
-               ber_printf( ber, "{eON}",
-                       entry_sync_state, &entryuuid_bv );
-       }
-
-       ch_free( entryuuid_bv.bv_val );
-       entryuuid_bv.bv_val = NULL;
-
-       ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_STATE;
-       ctrls[num_ctrls]->ldctl_iscritical = op->o_sync;
-       ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
-       ber_free_buf( ber );
-
-       if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE,
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#endif
-               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-               return ret;
-       }
-
-       return LDAP_SUCCESS;
-}
-
-int
-slap_build_sync_done_ctrl(
-       Operation       *op,
-       SlapReply       *rs,
-       LDAPControl     **ctrls,
-       int                     num_ctrls,
-       int                     send_cookie,
+void
+slap_compose_sync_cookie(
+       Operation *op,
        struct berval *cookie,
-       int                     refreshDeletes )
+       BerVarray csn,
+       int rid,
+       int sid )
 {
-       int ret;
-       BerElementBuffer berbuf;
-       BerElement *ber = (BerElement *)&berbuf;
+       int len, numcsn = 0;
 
-       ber_init2( ber, NULL, LBER_USE_DER );
-       ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
-
-       ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
-       ber_printf( ber, "{" );
-       if ( send_cookie && cookie ) {
-               ber_printf( ber, "O", cookie );
-       }
-       if ( refreshDeletes == LDAP_SYNC_REFRESH_DELETES ) {
-               ber_printf( ber, "b", refreshDeletes );
-       }
-       ber_printf( ber, "N}" );        
-
-       ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_DONE;
-       ctrls[num_ctrls]->ldctl_iscritical = op->o_sync;
-       ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
-       ber_free_buf( ber );
-
-       if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_done_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE,
-                       "slap_build_sync_done_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#endif
-               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-               return ret;
+       if ( csn ) {
+               for (; !BER_BVISNULL( &csn[numcsn] ); numcsn++);
        }
 
-       return LDAP_SUCCESS;
-}
-
-
-int
-slap_build_sync_state_ctrl_from_slog(
-       Operation       *op,
-       SlapReply       *rs,
-       struct slog_entry *slog_e,
-       int                     entry_sync_state,
-       LDAPControl     **ctrls,
-       int                     num_ctrls,
-       int                     send_cookie,
-       struct berval   *cookie)
-{
-       Attribute* a;
-       int ret;
-       int res;
-       const char *text = NULL;
-
-       BerElementBuffer berbuf;
-       BerElement *ber = (BerElement *)&berbuf;
-
-       struct berval entryuuid_bv      = BER_BVNULL;
-
-       ber_init2( ber, NULL, LBER_USE_DER );
-       ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
-
-       ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
-       ber_dupbv( &entryuuid_bv, &slog_e->sl_uuid );
-
-       if ( send_cookie && cookie ) {
-               ber_printf( ber, "{eOON}",
-                       entry_sync_state, &entryuuid_bv, cookie );
-       } else {
-               ber_printf( ber, "{eON}",
-                       entry_sync_state, &entryuuid_bv );
-       }
-
-       ch_free( entryuuid_bv.bv_val );
-       entryuuid_bv.bv_val = NULL;
-
-       ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_STATE;
-       ctrls[num_ctrls]->ldctl_iscritical = op->o_sync;
-       ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
-       ber_free_buf( ber );
-
-       if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE,
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#endif
-               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-               return ret;
-       }
-
-       return LDAP_SUCCESS;
-}
-
-int
-slap_send_syncinfo(
-       Operation       *op,
-       SlapReply       *rs,
-       int                     type,
-       struct berval *cookie,
-       int                     refreshDone,
-       BerVarray       syncUUIDs,
-       int                     refreshDeletes )
-{
-       BerElementBuffer berbuf;
-       BerElement *ber = (BerElement *)&berbuf;
-       struct berval rspdata;
-
-       int ret;
-
-       ber_init2( ber, NULL, LBER_USE_DER );
-       ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
-
-       if ( type ) {
-               switch ( type ) {
-               case LDAP_TAG_SYNC_NEW_COOKIE:
-                       ber_printf( ber, "tO", type, cookie );
-                       break;
-               case LDAP_TAG_SYNC_REFRESH_DELETE:
-               case LDAP_TAG_SYNC_REFRESH_PRESENT:
-                       ber_printf( ber, "t{", type );
-                       if ( cookie ) {
-                               ber_printf( ber, "O", cookie );
-                       }
-                       if ( refreshDone == 0 ) {
-                               ber_printf( ber, "b", refreshDone );
-                       }
-                       ber_printf( ber, "N}" );
-                       break;
-               case LDAP_TAG_SYNC_ID_SET:
-                       ber_printf( ber, "t{", type );
-                       if ( cookie ) {
-                               ber_printf( ber, "O", cookie );
-                       }
-                       if ( refreshDeletes == 1 ) {
-                               ber_printf( ber, "b", refreshDeletes );
+       if ( numcsn == 0 || rid == -1 ) {
+               char cookiestr[ LDAP_LUTIL_CSNSTR_BUFSIZE + 20 ];
+               if ( rid == -1 ) {
+                       cookiestr[0] = '\0';
+                       len = 0;
+               } else {
+                       len = snprintf( cookiestr, sizeof( cookiestr ),
+                                       "rid=%03d", rid );
+                       if ( sid >= 0 ) {
+                               len += sprintf( cookiestr+len, ",sid=%03x", sid );
                        }
-                       ber_printf( ber, "[W]", syncUUIDs );
-                       ber_printf( ber, "N}" );
-                       break;
-               default:
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, RESULTS,
-                               "slap_send_syncinfo: invalid syncinfo type (%d)\n",
-                               type, 0, 0 );
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "slap_send_syncinfo: invalid syncinfo type (%d)\n",
-                               type, 0, 0 );
-#endif
-                       return LDAP_OTHER;
                }
-       }
+               ber_str2bv_x( cookiestr, len, 1, cookie, 
+                       op ? op->o_tmpmemctx : NULL );
+       } else {
+               char *ptr;
+               int i;
 
-       ret = ber_flatten2( ber, &rspdata, 0 );
-
-       if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS,
-                       "slap_send_syncinfo: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE,
-                       "slap_send_syncinfo: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#endif
-               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-               return ret;
-       }
+               len = 0;
+               for ( i=0; i<numcsn; i++)
+                       len += csn[i].bv_len + 1;
 
-       rs->sr_rspdata = &rspdata;
-       send_ldap_intermediate( op, rs );
-       rs->sr_rspdata = NULL;
-       ber_free_buf( ber );
+               len += STRLENOF("rid=123,csn=");
+               if ( sid >= 0 )
+                       len += STRLENOF("sid=xxx,");
 
-       return LDAP_SUCCESS;
-}
+               cookie->bv_val = slap_sl_malloc( len, op ? op->o_tmpmemctx : NULL );
 
-void
-slap_compose_sync_cookie(
-       Operation *op,
-       struct berval *cookie,
-       struct berval *csn,
-       int sid,
-       int rid )
-{
-       char cookiestr[ LDAP_LUTIL_CSNSTR_BUFSIZE + 20 ];
-
-       if ( csn->bv_val == NULL ) {
-               if ( sid == -1 ) {
-                       if ( rid == -1 ) {
-                               cookiestr[0] = '\0';
-                       } else {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "rid=%03d", rid );
-                       }
-               } else {
-                       if ( rid == -1 ) {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "sid=%03d", sid );
-                       } else {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "sid=%03d,rid=%03d", sid, rid );
-                       }
+               len = sprintf( cookie->bv_val, "rid=%03d,", rid );
+               ptr = cookie->bv_val + len;
+               if ( sid >= 0 ) {
+                       ptr += sprintf( ptr, "sid=%03x,", sid );
                }
-       } else {
-               if ( sid == -1 ) {
-                       if ( rid == -1 ) {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "csn=%s", csn->bv_val );
-                       } else {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "csn=%s,rid=%03d", csn->bv_val, rid );
-                       }
-               } else {
-                       if ( rid == -1 ) {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "csn=%s,sid=%03d", csn->bv_val, sid );
-                       } else {
-                               snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-                                               "csn=%s,sid=%03d,rid=%03d", csn->bv_val, sid, rid );
-                       }
+               ptr = lutil_strcopy( ptr, "csn=" );
+               for ( i=0; i<numcsn; i++) {
+                       ptr = lutil_strncopy( ptr, csn[i].bv_val, csn[i].bv_len );
+                       *ptr++ = ';';
                }
+               ptr--;
+               *ptr = '\0';
+               cookie->bv_len = ptr - cookie->bv_val;
        }
-       ber_str2bv( cookiestr, strlen(cookiestr), 1, cookie );
 }
 
 void
@@ -358,14 +97,19 @@ slap_sync_cookie_free(
        if ( cookie == NULL )
                return;
 
+       if ( cookie->sids ) {
+               ch_free( cookie->sids );
+               cookie->sids = NULL;
+       }
+
        if ( cookie->ctxcsn ) {
                ber_bvarray_free( cookie->ctxcsn );
                cookie->ctxcsn = NULL;
        }
-
-       if ( cookie->octet_str ) {
-               ber_bvarray_free( cookie->octet_str );
-               cookie->octet_str = NULL;
+       cookie->numcsns = 0;
+       if ( !BER_BVISNULL( &cookie->octet_str )) {
+               ch_free( cookie->octet_str.bv_val );
+               BER_BVZERO( &cookie->octet_str );
        }
 
        if ( free_cookie ) {
@@ -375,65 +119,168 @@ slap_sync_cookie_free(
        return;
 }
 
+int
+slap_parse_csn_sid( struct berval *csnp )
+{
+       char *p, *q;
+       struct berval csn = *csnp;
+       int i;
+
+       p = ber_bvchr( &csn, '#' );
+       if ( !p )
+               return -1;
+       p++;
+       csn.bv_len -= p - csn.bv_val;
+       csn.bv_val = p;
+
+       p = ber_bvchr( &csn, '#' );
+       if ( !p )
+               return -1;
+       p++;
+       csn.bv_len -= p - csn.bv_val;
+       csn.bv_val = p;
+
+       q = ber_bvchr( &csn, '#' );
+       if ( !q )
+               return -1;
+
+       csn.bv_len = q - p;
+
+       i = strtol( p, &q, 16 );
+       if ( p == q || q != p + csn.bv_len || i < 0 || i > SLAP_SYNC_SID_MAX ) {
+               i = -1;
+       }
+
+       return i;
+}
+
+int *
+slap_parse_csn_sids( BerVarray csns, int numcsns, void *memctx )
+{
+       int i, *ret;
+
+       ret = slap_sl_malloc( numcsns * sizeof(int), memctx );
+       for ( i=0; i<numcsns; i++ ) {
+               ret[i] = slap_parse_csn_sid( &csns[i] );
+       }
+       return ret;
+}
+
 int
 slap_parse_sync_cookie(
-       struct sync_cookie *cookie
+       struct sync_cookie *cookie,
+       void *memctx
 )
 {
        char *csn_ptr;
        char *csn_str;
-       int csn_str_len;
-       char *sid_ptr;
-       char *sid_str;
-       char *rid_ptr;
-       char *rid_str;
        char *cval;
-       struct berval *ctxcsn;
+       char *next, *end;
+       AttributeDescription *ad = slap_schema.si_ad_modifyTimestamp;
 
        if ( cookie == NULL )
                return -1;
 
-       if (( csn_ptr = strstr( cookie->octet_str[0].bv_val, "csn=" )) != NULL ) {
-               csn_str = SLAP_STRNDUP( csn_ptr, LDAP_LUTIL_CSNSTR_BUFSIZE );
-               if ( (cval = strchr( csn_str, ',' )) != NULL ) {
-                       *cval = '\0';
-                       csn_str_len = cval - csn_str - (sizeof("csn=") - 1);
-               } else {
-                       csn_str_len = cookie->octet_str[0].bv_len -
-                                                       (csn_ptr - cookie->octet_str[0].bv_val) -
-                                                       (sizeof("csn=") - 1);
-               }
-               ctxcsn = ber_str2bv( csn_str + (sizeof("csn=")-1),
-                                                        csn_str_len, 1, NULL );
-               ch_free( csn_str );
-               ber_bvarray_add( &cookie->ctxcsn, ctxcsn );
-               ch_free( ctxcsn );
-       } else {
-               cookie->ctxcsn = NULL;
-       }
+       if ( cookie->octet_str.bv_len <= STRLENOF( "rid=" ) )
+               return -1;
 
-       if (( sid_ptr = strstr( cookie->octet_str->bv_val, "sid=" )) != NULL ) {
-               sid_str = SLAP_STRNDUP( sid_ptr,
-                                                       SLAP_SYNC_SID_SIZE + sizeof("sid=") - 1 );
-               if ( (cval = strchr( sid_str, ',' )) != NULL ) {
-                       *cval = '\0';
+       cookie->rid = -1;
+       cookie->sid = -1;
+       cookie->ctxcsn = NULL;
+       cookie->sids = NULL;
+       cookie->numcsns = 0;
+
+       end = cookie->octet_str.bv_val + cookie->octet_str.bv_len;
+
+       for ( next=cookie->octet_str.bv_val; next < end; ) {
+               if ( !strncmp( next, "rid=", STRLENOF("rid=") )) {
+                       char *rid_ptr = next;
+                       cookie->rid = strtol( &rid_ptr[ STRLENOF( "rid=" ) ], &next, 10 );
+                       if ( next == rid_ptr ||
+                               next > end ||
+                               ( *next && *next != ',' ) ||
+                               cookie->rid < 0 ||
+                               cookie->rid > SLAP_SYNC_RID_MAX )
+                       {
+                               return -1;
+                       }
+                       if ( *next == ',' ) {
+                               next++;
+                       }
+                       if ( !ad ) {
+                               break;
+                       }
+                       continue;
                }
-               cookie->sid = atoi( sid_str + sizeof("sid=") - 1 );
-               ch_free( sid_str );
-       } else {
-               cookie->sid = -1;
-       }
-
-       if (( rid_ptr = strstr( cookie->octet_str->bv_val, "rid=" )) != NULL ) {
-               rid_str = SLAP_STRNDUP( rid_ptr,
-                                                       SLAP_SYNC_RID_SIZE + sizeof("rid=") - 1 );
-               if ( (cval = strchr( rid_str, ',' )) != NULL ) {
-                       *cval = '\0';
+               if ( !strncmp( next, "sid=", STRLENOF("sid=") )) {
+                       char *sid_ptr = next;
+                       sid_ptr = next;
+                       cookie->sid = strtol( &sid_ptr[ STRLENOF( "sid=" ) ], &next, 16 );
+                       if ( next == sid_ptr ||
+                               next > end ||
+                               ( *next && *next != ',' ) ||
+                               cookie->sid < 0 ||
+                               cookie->sid > SLAP_SYNC_SID_MAX )
+                       {
+                               return -1;
+                       }
+                       if ( *next == ',' ) {
+                               next++;
+                       }
+                       continue;
                }
-               cookie->rid = atoi( rid_str + sizeof("rid=") - 1 );
-               ch_free( rid_str );
-       } else {
-               cookie->rid = -1;
+               if ( !strncmp( next, "csn=", STRLENOF("csn=") )) {
+                       slap_syntax_validate_func *validate;
+                       struct berval stamp;
+
+                       next += STRLENOF("csn=");
+                       while ( next < end ) {
+                               csn_str = next;
+                               /* FIXME use csnValidate when it gets implemented */
+                               csn_ptr = strchr( csn_str, '#' );
+                               if ( !csn_ptr || csn_ptr > end )
+                                       break;
+                               /* ad will be NULL when called from main. we just
+                                * want to parse the rid then. But we still iterate
+                                * through the string to find the end.
+                                */
+                               if ( ad ) {
+                                       stamp.bv_val = csn_str;
+                                       stamp.bv_len = csn_ptr - csn_str;
+                                       validate = ad->ad_type->sat_syntax->ssyn_validate;
+                                       if ( validate( ad->ad_type->sat_syntax, &stamp )
+                                               != LDAP_SUCCESS )
+                                               break;
+                               }
+                               cval = strchr( csn_ptr, ';' );
+                               if ( !cval )
+                                       cval = strchr(csn_ptr, ',' );
+                               if ( cval )
+                                       stamp.bv_len = cval - csn_str;
+                               else
+                                       stamp.bv_len = end - csn_str;
+                               if ( ad ) {
+                                       struct berval bv;
+                                       ber_dupbv_x( &bv, &stamp, memctx );
+                                       ber_bvarray_add_x( &cookie->ctxcsn, &bv, memctx );
+                                       cookie->numcsns++;
+                               }
+                               if ( cval ) {
+                                       next = cval + 1;
+                                       if ( *cval != ';' )
+                                               break;
+                               } else {
+                                       next = end;
+                                       break;
+                               }
+                       }
+                       continue;
+               }
+               next++;
+       }
+       if ( cookie->numcsns ) {
+               cookie->sids = slap_parse_csn_sids( cookie->ctxcsn, cookie->numcsns,
+                       memctx );
        }
        return 0;
 }
@@ -446,8 +293,6 @@ slap_init_sync_cookie_ctxcsn(
        char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE + 4 ];
        struct berval octet_str = BER_BVNULL;
        struct berval ctxcsn = BER_BVNULL;
-       struct berval ctxcsn_dup = BER_BVNULL;
-       struct berval slap_syncCookie;
 
        if ( cookie == NULL )
                return -1;
@@ -456,17 +301,15 @@ slap_init_sync_cookie_ctxcsn(
                                        "csn=%4d%02d%02d%02d%02d%02dZ#%06x#%02x#%06x",
                                        1900, 1, 1, 0, 0, 0, 0, 0, 0 );
        octet_str.bv_val = csnbuf;
-       build_new_dn( &slap_syncCookie, &cookie->octet_str[0], &octet_str, NULL );
-       ber_bvarray_free( cookie->octet_str );
-       cookie->octet_str = NULL;
-       ber_bvarray_add( &cookie->octet_str, &slap_syncCookie );
-
-       ber_dupbv( &ctxcsn, &octet_str );
-       ctxcsn.bv_val += 4;
-       ctxcsn.bv_len -= 4;
-       ber_dupbv( &ctxcsn_dup, &ctxcsn );
-       ch_free( ctxcsn.bv_val );
-       ber_bvarray_add( &cookie->ctxcsn, &ctxcsn_dup );
+       ch_free( cookie->octet_str.bv_val );
+       ber_dupbv( &cookie->octet_str, &octet_str );
+
+       ctxcsn.bv_val = octet_str.bv_val + 4;
+       ctxcsn.bv_len = octet_str.bv_len - 4;
+       cookie->ctxcsn = NULL;
+       value_add_one( &cookie->ctxcsn, &ctxcsn );
+       cookie->numcsns = 1;
+       cookie->sid = -1;
 
        return 0;
 }
@@ -477,62 +320,44 @@ slap_dup_sync_cookie(
        struct sync_cookie *src
 )
 {
-       int i;
        struct sync_cookie *new;
-       struct berval tmp_bv;
+       int i;
 
        if ( src == NULL )
                return NULL;
 
        if ( dst ) {
                ber_bvarray_free( dst->ctxcsn );
-               ber_bvarray_free( dst->octet_str );
+               dst->ctxcsn = NULL;
+               dst->sids = NULL;
+               ch_free( dst->octet_str.bv_val );
+               BER_BVZERO( &dst->octet_str );
                new = dst;
        } else {
                new = ( struct sync_cookie * )
                                ch_calloc( 1, sizeof( struct sync_cookie ));
        }
 
-       new->sid = src->sid;
        new->rid = src->rid;
+       new->sid = src->sid;
+       new->numcsns = src->numcsns;
 
-       if ( src->ctxcsn ) {
-               for ( i=0; src->ctxcsn[i].bv_val; i++ ) {
-                       ber_dupbv( &tmp_bv, &src->ctxcsn[i] );
-                       ber_bvarray_add( &new->ctxcsn, &tmp_bv );
+       if ( src->numcsns ) {
+               if ( ber_bvarray_dup_x( &new->ctxcsn, src->ctxcsn, NULL )) {
+                       if ( !dst ) {
+                               ch_free( new );
+                       }
+                       return NULL;
                }
+               new->sids = ch_malloc( src->numcsns * sizeof(int) );
+               for (i=0; i<src->numcsns; i++)
+                       new->sids[i] = src->sids[i];
        }
 
-       if ( src->octet_str ) {
-               for ( i=0; src->octet_str[i].bv_val; i++ ) {
-                       ber_dupbv( &tmp_bv, &src->octet_str[i] );
-                       ber_bvarray_add( &new->octet_str, &tmp_bv );
-               }
+       if ( !BER_BVISNULL( &src->octet_str )) {
+               ber_dupbv( &new->octet_str, &src->octet_str );
        }
 
        return new;
 }
 
-int
-slap_build_syncUUID_set(
-       Operation *op,
-       BerVarray *set,
-       Entry *e
-)
-{
-       int ret;
-       Attribute* a;
-
-       struct berval entryuuid_bv      = BER_BVNULL;
-
-       for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               AttributeDescription *desc = a->a_desc;
-               if ( desc == slap_schema.si_ad_entryUUID ) {
-                       ber_dupbv_x( &entryuuid_bv, &a->a_nvals[0], op->o_tmpmemctx );
-               }
-       }
-
-       ret = ber_bvarray_add_x( set, &entryuuid_bv, op->o_tmpmemctx );
-
-       return ret;
-}