Free IDL_CACHE locks

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 047c926762b8273ea7942035626e4d3346606eae..d1023d96231ce053d6176a926cfe5cc7219bba0c 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -22,19 +22,11 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 
-#ifdef LDAP_DEBUG
-static void at_index_print( void ) 
-{
-}
-#endif
-
 void
 attr_free( Attribute *a )
 {
        ber_bvarray_free( a->a_vals );
-#ifdef SLAP_NVALUES
-       ber_bvarray_free( a->a_nvals );
-#endif
+       if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
        free( a );
 }
 
@@ -65,29 +57,27 @@ Attribute *attr_dup( Attribute *a )
                }
 
                tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
-#ifdef SLAP_NVALUES
-               tmp->a_nvals = ch_malloc((i+1) * sizeof(struct berval));
-#endif
-
                for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
                        ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
                        if( tmp->a_vals[i].bv_val == NULL ) break;
-#ifdef SLAP_NVALUES
-                       ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
-                       if( tmp->a_nvals[i].bv_val == NULL ) break;
-#endif
                }
-
                tmp->a_vals[i].bv_val = NULL;
-#ifdef SLAP_NVALUES
-               tmp->a_nvals[i].bv_val = NULL;
-#endif
+
+               if( a->a_nvals != a->a_vals ) {
+                       tmp->a_nvals = ch_malloc((i+1) * sizeof(struct berval));
+                       for( i=0; a->a_nvals[i].bv_val != NULL; i++ ) {
+                               ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
+                               if( tmp->a_nvals[i].bv_val == NULL ) break;
+                       }
+                       tmp->a_nvals[i].bv_val = NULL;
+
+               } else {
+                       tmp->a_nvals = tmp->a_vals;
+               }
 
        } else {
                tmp->a_vals = NULL;
-#ifdef SLAP_NVALUES
                tmp->a_nvals = NULL;
-#endif
        }
 
        tmp->a_desc = a->a_desc;
@@ -120,6 +110,10 @@ Attribute *attrs_dup( Attribute *a )
 /*
  * attr_merge - merge the given type and value with the list of
  * attributes in attrs.
+ *
+ * For SLAP_NVALUES: nvals must be NULL if the attribute has no
+ * normalizer. In this case, a->a_nvals will be set equal to a->a_vals.
+ *
  * returns     0       everything went ok
  *             -1      trouble
  */
@@ -128,10 +122,8 @@ int
 attr_merge(
        Entry           *e,
        AttributeDescription *desc,
-       BerVarray       vals
-#ifdef SLAP_NVALUES
-       , BerVarray     nvals
-#endif
+       BerVarray       vals,
+       BerVarray       nvals
 ) {
        int rc;
 
@@ -147,30 +139,63 @@ attr_merge(
                *a = (Attribute *) ch_malloc( sizeof(Attribute) );
                (*a)->a_desc = desc;
                (*a)->a_vals = NULL;
-#ifdef SLAP_NVALUES
                (*a)->a_nvals = NULL;
-#endif
                (*a)->a_next = NULL;
                (*a)->a_flags = 0;
        }
 
        rc = value_add( &(*a)->a_vals, vals );
 
-#ifdef SLAP_NVALUES
        if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
-#endif
+       else (*a)->a_nvals = (*a)->a_vals;
 
        return rc;
 }
 
+int
+attr_merge_normalize(
+       Entry           *e,
+       AttributeDescription *desc,
+       BerVarray       vals,
+       void     *memctx
+) {
+       BerVarray       nvals = NULL;
+       int             rc;
+
+       if ( desc->ad_type->sat_equality->smr_normalize ) {
+               int     i;
+               
+               for ( i = 0; vals[i].bv_val; i++);
+
+               nvals = ch_calloc( sizeof(struct berval), i + 1 );
+               for ( i = 0; vals[i].bv_val; i++ ) {
+                       rc = (*desc->ad_type->sat_equality->smr_normalize)(
+                                       0,
+                                       desc->ad_type->sat_syntax,
+                                       desc->ad_type->sat_equality,
+                                       &vals[i], &nvals[i], memctx );
+
+                       if ( rc != LDAP_SUCCESS ) {
+                               nvals[i+1].bv_val = NULL;
+                               goto error_return;
+                       }
+               }
+               nvals[i].bv_val = NULL;
+       }
+
+       rc = attr_merge( e, desc, vals, nvals );
+
+error_return:;
+       ber_bvarray_free( nvals );
+       return rc;
+}
+
 int
 attr_merge_one(
        Entry           *e,
        AttributeDescription *desc,
-       struct berval   *val
-#ifdef SLAP_NVALUES
-       , BerVarray     nval
-#endif
+       struct berval   *val,
+       struct berval   *nval
 ) {
        int rc;
        Attribute       **a;
@@ -185,18 +210,42 @@ attr_merge_one(
                *a = (Attribute *) ch_malloc( sizeof(Attribute) );
                (*a)->a_desc = desc;
                (*a)->a_vals = NULL;
-#ifdef SLAP_NVALUES
                (*a)->a_nvals = NULL;
-#endif
                (*a)->a_next = NULL;
                (*a)->a_flags = 0;
        }
 
        rc = value_add_one( &(*a)->a_vals, val );
 
-#ifdef SLAP_NVALUES
        if( !rc && nval ) rc = value_add_one( &(*a)->a_nvals, nval );
-#endif
+       else (*a)->a_nvals = (*a)->a_vals;
+       return rc;
+}
+
+int
+attr_merge_normalize_one(
+       Entry           *e,
+       AttributeDescription *desc,
+       struct berval   *val,
+       void            *memctx
+) {
+       struct berval   nval;
+       int             rc;
+
+       if ( desc->ad_type->sat_equality->smr_normalize ) {
+               rc = (*desc->ad_type->sat_equality->smr_normalize)(
+                               0,
+                               desc->ad_type->sat_syntax,
+                               desc->ad_type->sat_equality,
+                               val, &nval, memctx );
+
+               if ( rc != LDAP_SUCCESS ) {
+                       return rc;
+               }
+       }
+
+       rc = attr_merge_one( e, desc, val, &nval );
+       ch_free( nval.bv_val );
        return rc;
 }