/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 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 */
#include "ldap_pvt.h"
#include "slap.h"
-#ifdef LDAP_DEBUG
-static void at_index_print( void );
-#endif
-
void
attr_free( Attribute *a )
{
- ad_free( a->a_desc, 1 );
- ber_bvecfree( a->a_vals );
+ ber_bvarray_free( a->a_vals );
+#ifdef SLAP_NVALUES
+ ber_bvarray_free( a->a_nvals );
+#endif
free( a );
}
if( a->a_vals != NULL ) {
int i;
- for( i=0; a->a_vals[i] != NULL; i++ ) {
+ for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
/* EMPTY */ ;
}
- tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval*));
-
- for( i=0; a->a_vals[i] != NULL; i++ ) {
- tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
-
- if( tmp->a_vals[i] == NULL ) break;
+ 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] = NULL;
+ tmp->a_vals[i].bv_val = NULL;
+
+#ifdef SLAP_NVALUES
+ if( a->a_nvals != NULL ) {
+ 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 = NULL;
+ }
+#endif
} else {
tmp->a_vals = NULL;
+#ifdef SLAP_NVALUES
+ tmp->a_nvals = NULL;
+#endif
}
- tmp->a_desc = ad_dup( a->a_desc );
+ tmp->a_desc = a->a_desc;
tmp->a_next = NULL;
+ tmp->a_flags = 0;
return tmp;
}
int
attr_merge(
- Entry *e,
+ Entry *e,
AttributeDescription *desc,
- struct berval **vals )
-{
+ BerVarray vals
+#ifdef SLAP_NVALUES
+ , BerVarray nvals
+#endif
+) {
+ int rc;
+
Attribute **a;
for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
- {
+ if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
break;
}
}
if ( *a == NULL ) {
*a = (Attribute *) ch_malloc( sizeof(Attribute) );
- (*a)->a_desc = ad_dup( desc );
+ (*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 );
+#endif
+
+ return rc;
+}
+
+int
+attr_merge_one(
+ Entry *e,
+ AttributeDescription *desc,
+ 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 ) {
+ if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+ break;
+ }
+ }
+
+ if ( *a == NULL ) {
+ *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
+ return rc;
}
/*
)
{
for ( ; a != NULL; a = a->a_next ) {
- if ( ad_cmp( a->a_desc, desc ) == 0 )
- {
+ if ( ad_cmp( a->a_desc, desc ) == 0 ) {
return( a );
}
}
Attribute **a;
for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
- {
+ if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
Attribute *save = *a;
*a = (*a)->a_next;
attr_free( save );