compare attribute type, not value

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index e35ac85ca146fd3b1648d7a117d1f72ee696d563..c3c0b0d47257a1044244ad77e05cc5d6e448ed9e 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,7 +1,7 @@
 /* value.c - routines for dealing with values */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -20,32 +20,35 @@
 
 int
 value_add( 
-    struct berval      ***vals,
-    struct berval      **addvals
+    BerVarray *vals,
+    BerVarray addvals
 )
 {
-       int     n, nn, i, j;
+       int     n, nn;
+       BerVarray v2;
 
-       for ( nn = 0; addvals != NULL && addvals[nn] != NULL; nn++ )
+       for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
                ;       /* NULL */
 
        if ( *vals == NULL ) {
-               *vals = (struct berval **) ch_malloc( (nn + 1)
-                   * sizeof(struct berval *) );
+               *vals = (BerVarray) ch_malloc( (nn + 1)
+                   * sizeof(struct berval) );
                n = 0;
-
        } else {
-               for ( n = 0; (*vals)[n] != NULL; n++ )
-                       ;       /* NULL */
-               *vals = (struct berval **) ch_realloc( (char *) *vals,
-                   (n + nn + 1) * sizeof(struct berval *) );
+               for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+                       ;       /* Empty */
+               }
+               *vals = (BerVarray) ch_realloc( (char *) *vals,
+                   (n + nn + 1) * sizeof(struct berval) );
        }
 
-       for ( i = 0, j = 0; i < nn; i++ ) {
-               (*vals)[n + j] = ber_bvdup( addvals[i] );
-               if( (*vals)[n + j++] == NULL ) break;
+       v2 = *vals + n;
+       for ( ; addvals->bv_val; v2++, addvals++ ) {
+               ber_dupbv(v2, addvals);
+               if (v2->bv_val == NULL) break;
        }
-       (*vals)[n + j] = NULL;
+       v2->bv_val = NULL;
+       v2->bv_len = 0;
 
        return LDAP_SUCCESS;
 }
@@ -174,12 +177,12 @@ value_match(
 int value_find_ex(
        AttributeDescription *ad,
        unsigned flags,
-       struct berval **vals,
+       BerVarray vals,
        struct berval *val )
 {
        int     i;
        int rc;
-       struct berval nval;
+       struct berval nval = { 0, NULL };
        struct berval nval_tmp;
        MatchingRule *mr = ad->ad_type->sat_equality;
 
@@ -212,12 +215,12 @@ int value_find_ex(
                }
        }
 
-       for ( i = 0; vals[i] != NULL; i++ ) {
+       for ( i = 0; vals[i].bv_val != NULL; i++ ) {
                int match;
                const char *text;
 
                rc = value_match( &match, ad, mr, flags,
-                       vals[i], nval.bv_val == NULL ? val : &nval, &text );
+                       &vals[i], nval.bv_val == NULL ? val : &nval, &text );
 
                if( rc == LDAP_SUCCESS && match == 0 ) {
                        free( nval.bv_val );