minor naming cleanup; improvements to DN mapping layer; major docs update

[openldap] / servers / slapd / ldapsync.c

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 4d6afd8e45ddcc24bb49375b94c2e186254f52ef..9d5867cd1cd2da034c6184bf47bb745a1601f1b4 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-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2005 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -117,31 +117,44 @@ slap_parse_sync_cookie(
        char *csn_ptr;
        char *csn_str;
        int csn_str_len;
+       int valid = 0;
        char *sid_ptr;
        char *sid_str;
        char *rid_ptr;
        char *rid_str;
        char *cval;
-       struct berval *ctxcsn;
+       struct berval ctxcsn;
 
        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 );
+       while (( csn_ptr = strstr( cookie->octet_str[0].bv_val, "csn=" )) != NULL ) {
+               AttributeDescription *ad = slap_schema.si_ad_modifyTimestamp;
+               slap_syntax_validate_func *validate;
+               struct berval stamp;
+
+               csn_str = csn_ptr + STRLENOF("csn=");
+               cval = strchr( csn_str, ',' );
+               if ( cval )
+                       csn_str_len = cval - csn_str;
+               else
+                       csn_str_len = 0;
+
+               /* FIXME use csnValidate when it gets implemented */
+               csn_ptr = strchr( csn_str, '#' );
+               if ( !csn_ptr ) break;
+
+               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;
+               valid = 1;
+               break;
+       }
+       if ( valid ) {
+               ber_str2bv( csn_str, csn_str_len, 1, &ctxcsn );
+               ber_bvarray_add( &cookie->ctxcsn, &ctxcsn );
        } else {
                cookie->ctxcsn = NULL;
        }
@@ -245,27 +258,3 @@ slap_dup_sync_cookie(
        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 );
-                       break;
-               }
-       }
-
-       ret = ber_bvarray_add_x( set, &entryuuid_bv, op->o_tmpmemctx );
-
-       return ret;
-}