ITS#7735 fix memctx usage in prev commit

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index f4d76dc21c92269ea15419251e557bb8d2ace93a..b97ee9abb0faf5ecec893df027454ce0d62e2c49 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@ attr_alloc( AttributeDescription *ad )
        ldap_pvt_thread_mutex_unlock( &attr_mutex );
        
        a->a_desc = ad;
+       if ( ad && ( ad->ad_type->sat_flags & SLAP_AT_SORTED_VAL ))
+               a->a_flags |= SLAP_ATTR_SORTED_VALS;
 
        return a;
 }
@@ -211,8 +213,9 @@ attrs_free( Attribute *a )
 static void
 attr_dup2( Attribute *tmp, Attribute *a )
 {
+       tmp->a_flags = a->a_flags & SLAP_ATTR_PERSISTENT_FLAGS;
        if ( a->a_vals != NULL ) {
-               int     i;
+               unsigned        i, j;
 
                tmp->a_numvals = a->a_numvals;
                tmp->a_vals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
@@ -227,16 +230,18 @@ attr_dup2( Attribute *tmp, Attribute *a )
                assert( a->a_nvals != NULL );
 
                if ( a->a_nvals != a->a_vals ) {
-                       int     j;
 
                        tmp->a_nvals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
-                       for ( j = 0; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
-                               assert( j < i );
-                               ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
-                               if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
-                               /* FIXME: error? */
+                       j = 0;
+                       if ( i ) {
+                               for ( ; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
+                                       assert( j < i );
+                                       ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
+                                       if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
+                                       /* FIXME: error? */
+                               }
+                               assert( j == i );
                        }
-                       assert( j == i );
                        BER_BVZERO( &tmp->a_nvals[j] );
 
                } else {
@@ -281,6 +286,83 @@ attrs_dup( Attribute *a )
        return anew;
 }
 
+int
+attr_valfind(
+       Attribute *a,
+       unsigned flags,
+       struct berval *val,
+       unsigned *slot,
+       void *ctx )
+{
+       struct berval nval = BER_BVNULL, *cval;
+       MatchingRule *mr;
+       const char *text;
+       int match = -1, rc;
+       unsigned i, n;
+
+       if ( flags & SLAP_MR_ORDERING )
+               mr = a->a_desc->ad_type->sat_ordering;
+       else
+               mr = a->a_desc->ad_type->sat_equality;
+
+       if( !SLAP_IS_MR_ASSERTED_VALUE_NORMALIZED_MATCH( flags ) &&
+               mr->smr_normalize )
+       {
+               rc = (mr->smr_normalize)(
+                       flags & (SLAP_MR_TYPE_MASK|SLAP_MR_SUBTYPE_MASK|SLAP_MR_VALUE_OF_SYNTAX),
+                       a->a_desc->ad_type->sat_syntax,
+                       mr, val, &nval, ctx );
+
+               if( rc != LDAP_SUCCESS ) {
+                       return LDAP_INVALID_SYNTAX;
+               }
+               cval = &nval;
+       } else {
+               cval = val;
+       }
+
+       n = a->a_numvals;
+       if ( (a->a_flags & SLAP_ATTR_SORTED_VALS) && n ) {
+               /* Binary search */
+               unsigned base = 0;
+
+               do {
+                       unsigned pivot = n >> 1;
+                       i = base + pivot;
+                       rc = value_match( &match, a->a_desc, mr, flags,
+                               &a->a_nvals[i], cval, &text );
+                       if ( rc == LDAP_SUCCESS && match == 0 )
+                               break;
+                       if ( match < 0 ) {
+                               base = i+1;
+                               n -= pivot+1;
+                       } else {
+                               n = pivot;
+                       }
+               } while ( n );
+               if ( match < 0 )
+                       i++;
+       } else {
+       /* Linear search */
+               for ( i = 0; i < n; i++ ) {
+                       const char *text;
+
+                       rc = ordered_value_match( &match, a->a_desc, mr, flags,
+                               &a->a_nvals[i], cval, &text );
+                       if ( rc == LDAP_SUCCESS && match == 0 )
+                               break;
+               }
+       }
+       if ( match )
+               rc = LDAP_NO_SUCH_ATTRIBUTE;
+       if ( slot )
+               *slot = i;
+       if ( nval.bv_val )
+               slap_sl_free( nval.bv_val, ctx );
+
+       return rc;
+}
+
 int
 attr_valadd(
        Attribute *a,
@@ -312,22 +394,52 @@ attr_valadd(
                a->a_nvals = a->a_vals;
        }
 
-       v2 = &a->a_vals[a->a_numvals];
-       for ( i = 0 ; i < nn; i++ ) {
-               ber_dupbv( &v2[i], &vals[i] );
-               if ( BER_BVISNULL( &v2[i] ) ) break;
-       }
-       BER_BVZERO( &v2[i] );
-
-       if ( nvals ) {
-               v2 = &a->a_nvals[a->a_numvals];
+       /* If sorted and old vals exist, must insert */
+       if (( a->a_flags & SLAP_ATTR_SORTED_VALS ) && a->a_numvals ) {
+               unsigned slot;
+               int j, rc;
+               v2 = nvals ? nvals : vals;
+               for ( i = 0; i < nn; i++ ) {
+                       rc = attr_valfind( a, SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX |
+                               SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+                               &v2[i], &slot, NULL );
+                       if ( rc != LDAP_NO_SUCH_ATTRIBUTE ) {
+                               /* should never happen */
+                               if ( rc == LDAP_SUCCESS )
+                                       rc = LDAP_TYPE_OR_VALUE_EXISTS;
+                               return rc;
+                       }
+                       for ( j = a->a_numvals; j >= (int)slot; j-- ) {
+                               a->a_vals[j+1] = a->a_vals[j];
+                               if ( nvals )
+                                       a->a_nvals[j+1] = a->a_nvals[j];
+                       }
+                       ber_dupbv( &a->a_nvals[slot], &v2[i] );
+                       if ( nvals )
+                               ber_dupbv( &a->a_vals[slot], &vals[i] );
+                       a->a_numvals++;
+               }
+               BER_BVZERO( &a->a_vals[a->a_numvals] );
+               if ( a->a_vals != a->a_nvals )
+                       BER_BVZERO( &a->a_nvals[a->a_numvals] );
+       } else {
+               v2 = &a->a_vals[a->a_numvals];
                for ( i = 0 ; i < nn; i++ ) {
-                       ber_dupbv( &v2[i], &nvals[i] );
+                       ber_dupbv( &v2[i], &vals[i] );
                        if ( BER_BVISNULL( &v2[i] ) ) break;
                }
                BER_BVZERO( &v2[i] );
+
+               if ( nvals ) {
+                       v2 = &a->a_nvals[a->a_numvals];
+                       for ( i = 0 ; i < nn; i++ ) {
+                               ber_dupbv( &v2[i], &nvals[i] );
+                               if ( BER_BVISNULL( &v2[i] ) ) break;
+                       }
+                       BER_BVZERO( &v2[i] );
+               }
+               a->a_numvals += i;
        }
-       a->a_numvals += i;
        return 0;
 }