#unifdef -DSLAP_NVALUES_ON_DISK

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index ab9c56511ed0052bc06f44e07aa350d29230f32a..599b89193a6f78f93f93a75f6b94d6d4ea00923d 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* attr.c - routines for dealing with attributes */
@@ -22,16 +22,13 @@
 #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
+       if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
+#endif
        free( a );
 }
 
@@ -62,16 +59,31 @@ Attribute *attr_dup( Attribute *a )
                }
 
                tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
-
                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;
                }
-
                tmp->a_vals[i].bv_val = NULL;
 
+#ifdef SLAP_NVALUES
+               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;
+               }
+#endif
+
        } else {
                tmp->a_vals = NULL;
+#ifdef SLAP_NVALUES
+               tmp->a_nvals = NULL;
+#endif
        }
 
        tmp->a_desc = a->a_desc;
@@ -104,6 +116,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
  */
@@ -112,8 +128,13 @@ int
 attr_merge(
        Entry           *e,
        AttributeDescription *desc,
-       BerVarray       vals )
-{
+       BerVarray       vals
+#ifdef SLAP_NVALUES
+       , BerVarray     nvals
+#endif
+) {
+       int rc;
+
        Attribute       **a;
 
        for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
@@ -126,19 +147,33 @@ 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;
        }
 
-       return( value_add( &(*a)->a_vals, vals ) );
+       rc = value_add( &(*a)->a_vals, vals );
+
+#ifdef SLAP_NVALUES
+       if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
+       else (*a)->a_nvals = (*a)->a_vals;
+#endif
+
+       return rc;
 }
 
 int
 attr_merge_one(
        Entry           *e,
        AttributeDescription *desc,
-       struct berval   *val )
-{
+       struct berval   *val
+#ifdef SLAP_NVALUES
+       , struct berval *nval
+#endif
+) {
+       int rc;
        Attribute       **a;
 
        for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
@@ -151,11 +186,20 @@ 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;
        }
 
-       return( value_add_one( &(*a)->a_vals, val ) );
+       rc = value_add_one( &(*a)->a_vals, val );
+
+#ifdef SLAP_NVALUES
+       if( !rc && nval ) rc = value_add_one( &(*a)->a_nvals, nval );
+       else (*a)->a_nvals = (*a)->a_vals;
+#endif
+       return rc;
 }
 
 /*