+/* attr.c - routines for dealing with attributes */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
-/* attr.c - routines for dealing with attributes */
#include "portable.h"
#include <ac/string.h>
#include <ac/time.h>
-#include "ldap_pvt.h"
#include "slap.h"
+/*
+ * Allocate in chunks, minimum of 1000 at a time.
+ */
+#define CHUNK_SIZE 1000
+typedef struct slap_list {
+ struct slap_list *next;
+} slap_list;
+static slap_list *attr_chunks;
+static Attribute *attr_list;
+static ldap_pvt_thread_mutex_t attr_mutex;
+
+int
+attr_prealloc( int num )
+{
+ Attribute *a;
+ slap_list *s;
+
+ if (!num) return 0;
+
+ s = ch_calloc( 1, sizeof(slap_list) + num * sizeof(Attribute));
+ s->next = attr_chunks;
+ attr_chunks = s;
+
+ a = (Attribute *)(s+1);
+ for ( ;num>1; num--) {
+ a->a_next = a+1;
+ a++;
+ }
+ a->a_next = attr_list;
+ attr_list = (Attribute *)(s+1);
+
+ return 0;
+}
+
+Attribute *
+attr_alloc( AttributeDescription *ad )
+{
+ Attribute *a;
+
+ ldap_pvt_thread_mutex_lock( &attr_mutex );
+ if ( !attr_list )
+ attr_prealloc( CHUNK_SIZE );
+ a = attr_list;
+ attr_list = a->a_next;
+ a->a_next = NULL;
+ ldap_pvt_thread_mutex_unlock( &attr_mutex );
+
+ a->a_desc = ad;
+
+ return a;
+}
+
+/* Return a list of num attrs */
+Attribute *
+attrs_alloc( int num )
+{
+ Attribute *head = NULL;
+ Attribute **a;
+
+ ldap_pvt_thread_mutex_lock( &attr_mutex );
+ for ( a = &attr_list; *a && num > 0; a = &(*a)->a_next ) {
+ if ( !head )
+ head = *a;
+ num--;
+ }
+ attr_list = *a;
+ if ( num > 0 ) {
+ attr_prealloc( num > CHUNK_SIZE ? num : CHUNK_SIZE );
+ *a = attr_list;
+ for ( ; *a && num > 0; a = &(*a)->a_next ) {
+ if ( !head )
+ head = *a;
+ num--;
+ }
+ attr_list = *a;
+ }
+ *a = NULL;
+ ldap_pvt_thread_mutex_unlock( &attr_mutex );
+
+ return head;
+}
+
+
+void
+attr_clean( Attribute *a )
+{
+ if ( a->a_nvals && a->a_nvals != a->a_vals &&
+ !( a->a_flags & SLAP_ATTR_DONT_FREE_VALS )) {
+ if ( a->a_flags & SLAP_ATTR_DONT_FREE_DATA ) {
+ free( a->a_nvals );
+ } else {
+ ber_bvarray_free( a->a_nvals );
+ }
+ }
+ /* a_vals may be equal to slap_dummy_bv, a static empty berval;
+ * this is used as a placeholder for attributes that do not carry
+ * values, e.g. when proxying search entries with the "attrsonly"
+ * bit set. */
+ if ( a->a_vals != &slap_dummy_bv &&
+ !( a->a_flags & SLAP_ATTR_DONT_FREE_VALS )) {
+ if ( a->a_flags & SLAP_ATTR_DONT_FREE_DATA ) {
+ free( a->a_vals );
+ } else {
+ ber_bvarray_free( a->a_vals );
+ }
+ }
+ a->a_desc = NULL;
+ a->a_vals = NULL;
+ a->a_nvals = NULL;
+#ifdef LDAP_COMP_MATCH
+ a->a_comp_data = NULL;
+#endif
+ a->a_flags = 0;
+}
+
void
attr_free( Attribute *a )
{
- ber_bvarray_free( a->a_vals );
- if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
- free( a );
+ attr_clean( a );
+ ldap_pvt_thread_mutex_lock( &attr_mutex );
+ a->a_next = attr_list;
+ attr_list = a;
+ ldap_pvt_thread_mutex_unlock( &attr_mutex );
}
+#ifdef LDAP_COMP_MATCH
void
-attrs_free( Attribute *a )
+comp_tree_free( Attribute *a )
{
Attribute *next;
for( ; a != NULL ; a = next ) {
next = a->a_next;
- attr_free( a );
+ if ( component_destructor && a->a_comp_data ) {
+ if ( a->a_comp_data->cd_mem_op )
+ component_destructor( a->a_comp_data->cd_mem_op );
+ free ( a->a_comp_data );
+ }
}
}
+#endif
-Attribute *attr_dup( Attribute *a )
+void
+attrs_free( Attribute *a )
{
- Attribute *tmp;
-
- if( a == NULL) return NULL;
-
- tmp = ch_malloc( sizeof(Attribute) );
+ Attribute *b, *tail, *next;
+
+ if ( a ) {
+ tail = a;
+ do {
+ next = a->a_next;
+ attr_clean( a );
+ a->a_next = b;
+ b = a;
+ a = next;
+ } while ( next );
+
+ ldap_pvt_thread_mutex_lock( &attr_mutex );
+ tail->a_next = attr_list;
+ attr_list = b;
+ ldap_pvt_thread_mutex_unlock( &attr_mutex );
+ }
+}
- if( a->a_vals != NULL ) {
- int i;
+static void
+attr_dup2( Attribute *tmp, Attribute *a )
+{
+ if ( a->a_vals != NULL ) {
+ int i;
- for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+ for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
/* EMPTY */ ;
}
- tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
- for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+ tmp->a_vals = ch_malloc( (i + 1) * sizeof(struct berval) );
+ for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
- if( tmp->a_vals[i].bv_val == NULL ) break;
+ if ( BER_BVISNULL( &tmp->a_vals[i] ) ) break;
+ /* FIXME: error? */
}
- tmp->a_vals[i].bv_val = NULL;
+ BER_BVZERO( &tmp->a_vals[i] );
+
+ /* a_nvals must be non null; it may be equal to a_vals */
+ assert( a->a_nvals != NULL );
+
+ if ( a->a_nvals != a->a_vals ) {
+ int j;
- 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 = ch_malloc( (i + 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? */
}
- tmp->a_nvals[i].bv_val = NULL;
+ assert( j == i );
+ BER_BVZERO( &tmp->a_nvals[j] );
} else {
tmp->a_nvals = tmp->a_vals;
}
-
- } else {
- tmp->a_vals = NULL;
- tmp->a_nvals = NULL;
}
+}
+
+Attribute *
+attr_dup( Attribute *a )
+{
+ Attribute *tmp;
- tmp->a_desc = a->a_desc;
- tmp->a_next = NULL;
- tmp->a_flags = 0;
+ if ( a == NULL) return NULL;
+ tmp = attr_alloc( a->a_desc );
+ attr_dup2( tmp, a );
return tmp;
}
-Attribute *attrs_dup( Attribute *a )
+Attribute *
+attrs_dup( Attribute *a )
{
- Attribute *tmp, **next;
+ int i;
+ Attribute *tmp, *anew;
if( a == NULL ) return NULL;
- tmp = NULL;
- next = &tmp;
+ /* count them */
+ for( tmp=a,i=0; tmp; tmp=tmp->a_next ) {
+ i++;
+ }
+
+ anew = attrs_alloc( i );
- for( ; a != NULL ; a = a->a_next ) {
- *next = attr_dup( a );
- next = &((*next)->a_next);
+ for( tmp=anew; a; a=a->a_next ) {
+ tmp->a_desc = a->a_desc;
+ attr_dup2( tmp, a );
+ tmp=tmp->a_next;
}
- *next = NULL;
- return tmp;
+ return anew;
}
-
/*
* attr_merge - merge the given type and value with the list of
* attributes in attrs.
Entry *e,
AttributeDescription *desc,
BerVarray vals,
- BerVarray nvals
-) {
+ BerVarray nvals )
+{
int rc;
Attribute **a;
for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+ if ( (*a)->a_desc == desc ) {
break;
}
}
if ( *a == NULL ) {
- *a = (Attribute *) ch_malloc( sizeof(Attribute) );
- (*a)->a_desc = desc;
- (*a)->a_vals = NULL;
- (*a)->a_nvals = NULL;
- (*a)->a_next = NULL;
- (*a)->a_flags = 0;
+ *a = attr_alloc( desc );
+ } else {
+ /*
+ * FIXME: if the attribute already exists, the presence
+ * of nvals and the value of (*a)->a_nvals must be consistent
+ */
+ assert( ( nvals == NULL && (*a)->a_nvals == (*a)->a_vals )
+ || ( nvals != NULL && (
+ ( (*a)->a_vals == NULL && (*a)->a_nvals == NULL )
+ || ( (*a)->a_nvals != (*a)->a_vals ) ) ) );
}
rc = value_add( &(*a)->a_vals, vals );
- if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
- else (*a)->a_nvals = (*a)->a_vals;
+ if ( rc == LDAP_SUCCESS ) {
+ if ( nvals ) {
+ rc = value_add( &(*a)->a_nvals, nvals );
+ /* FIXME: what if rc != LDAP_SUCCESS ? */
+ } else {
+ (*a)->a_nvals = (*a)->a_vals;
+ }
+ }
return rc;
}
+/*
+ * if a normalization function is defined for the equality matchingRule
+ * of desc, the value is normalized and stored in nval; otherwise nval
+ * is NULL
+ */
int
-attr_merge_normalize(
- Entry *e,
- AttributeDescription *desc,
- BerVarray vals,
- void *memctx
-) {
+attr_normalize(
+ AttributeDescription *desc,
+ BerVarray vals,
+ BerVarray *nvalsp,
+ void *memctx )
+{
+ int rc = LDAP_SUCCESS;
BerVarray nvals = NULL;
- int rc;
- if ( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize ) {
+ *nvalsp = NULL;
+
+ if ( desc->ad_type->sat_equality &&
+ desc->ad_type->sat_equality->smr_normalize )
+ {
int i;
- for ( i = 0; vals[i].bv_val; i++ );
+ for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ );
- nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
- for ( i = 0; vals[i].bv_val; i++ ) {
- rc = (*desc->ad_type->sat_equality->smr_normalize)(
- 0,
+ nvals = slap_sl_calloc( sizeof(struct berval), i + 1, memctx );
+ for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ ) {
+ rc = desc->ad_type->sat_equality->smr_normalize(
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
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;
+ BER_BVZERO( &nvals[i + 1] );
+ break;
}
}
- nvals[i].bv_val = NULL;
+ BER_BVZERO( &nvals[i] );
+ *nvalsp = nvals;
}
- rc = attr_merge( e, desc, vals, nvals );
-
error_return:;
- if ( nvals != NULL ) {
+ if ( rc != LDAP_SUCCESS && nvals != NULL ) {
ber_bvarray_free_x( nvals, memctx );
}
+
+ return rc;
+}
+
+int
+attr_merge_normalize(
+ Entry *e,
+ AttributeDescription *desc,
+ BerVarray vals,
+ void *memctx )
+{
+ BerVarray nvals = NULL;
+ int rc;
+
+ rc = attr_normalize( desc, vals, &nvals, memctx );
+ if ( rc == LDAP_SUCCESS ) {
+ rc = attr_merge( e, desc, vals, nvals );
+ if ( nvals != NULL ) {
+ ber_bvarray_free_x( nvals, memctx );
+ }
+ }
+
return rc;
}
Entry *e,
AttributeDescription *desc,
struct berval *val,
- struct berval *nval
-) {
+ struct berval *nval )
+{
int rc;
Attribute **a;
for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+ if ( (*a)->a_desc == desc ) {
break;
}
}
if ( *a == NULL ) {
- *a = (Attribute *) ch_malloc( sizeof(Attribute) );
- (*a)->a_desc = desc;
- (*a)->a_vals = NULL;
- (*a)->a_nvals = NULL;
- (*a)->a_next = NULL;
- (*a)->a_flags = 0;
+ *a = attr_alloc( desc );
}
rc = value_add_one( &(*a)->a_vals, val );
- if( !rc && nval ) rc = value_add_one( &(*a)->a_nvals, nval );
- else (*a)->a_nvals = (*a)->a_vals;
+ if ( rc == LDAP_SUCCESS ) {
+ if ( nval ) {
+ rc = value_add_one( &(*a)->a_nvals, nval );
+ /* FIXME: what if rc != LDAP_SUCCESS ? */
+ } else {
+ (*a)->a_nvals = (*a)->a_vals;
+ }
+ }
return rc;
}
+/*
+ * if a normalization function is defined for the equality matchingRule
+ * of desc, the value is normalized and stored in nval; otherwise nval
+ * is NULL
+ */
int
-attr_merge_normalize_one(
- Entry *e,
+attr_normalize_one(
AttributeDescription *desc,
struct berval *val,
- void *memctx
-) {
- struct berval nval;
- struct berval *nvalp;
- int rc;
+ struct berval *nval,
+ void *memctx )
+{
+ int rc = LDAP_SUCCESS;
- if ( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize ) {
- rc = (*desc->ad_type->sat_equality->smr_normalize)(
- 0,
+ BER_BVZERO( nval );
+
+ if ( desc->ad_type->sat_equality &&
+ desc->ad_type->sat_equality->smr_normalize )
+ {
+ rc = desc->ad_type->sat_equality->smr_normalize(
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
desc->ad_type->sat_syntax,
desc->ad_type->sat_equality,
- val, &nval, memctx );
+ val, nval, memctx );
if ( rc != LDAP_SUCCESS ) {
return rc;
}
+ }
+
+ return rc;
+}
+
+int
+attr_merge_normalize_one(
+ Entry *e,
+ AttributeDescription *desc,
+ struct berval *val,
+ void *memctx )
+{
+ struct berval nval = BER_BVNULL;
+ struct berval *nvalp = NULL;
+ int rc;
+
+ rc = attr_normalize_one( desc, val, &nval, memctx );
+ if ( rc == LDAP_SUCCESS && !BER_BVISNULL( &nval ) ) {
nvalp = &nval;
- } else {
- nvalp = NULL;
}
rc = attr_merge_one( e, desc, val, nvalp );
if ( nvalp != NULL ) {
- sl_free( nval.bv_val, memctx );
+ slap_sl_free( nval.bv_val, memctx );
}
return rc;
}
Attribute *
attrs_find(
Attribute *a,
- AttributeDescription *desc
-)
+ AttributeDescription *desc )
{
for ( ; a != NULL; a = a->a_next ) {
if ( is_ad_subtype( a->a_desc, desc ) ) {
Attribute *
attr_find(
Attribute *a,
- AttributeDescription *desc
-)
+ AttributeDescription *desc )
{
for ( ; a != NULL; a = a->a_next ) {
- if ( ad_cmp( a->a_desc, desc ) == 0 ) {
+ if ( a->a_desc == desc ) {
return( a );
}
}
int
attr_delete(
Attribute **attrs,
- AttributeDescription *desc
-)
+ AttributeDescription *desc )
{
Attribute **a;
for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+ if ( (*a)->a_desc == desc ) {
Attribute *save = *a;
*a = (*a)->a_next;
attr_free( save );
return LDAP_NO_SUCH_ATTRIBUTE;
}
+int
+attr_init( void )
+{
+ ldap_pvt_thread_mutex_init( &attr_mutex );
+ return 0;
+}
+
+int
+attr_destroy( void )
+{
+ slap_list *a;
+
+ for ( a=attr_chunks; a; a=attr_chunks ) {
+ attr_chunks = a->next;
+ free( a );
+ }
+ ldap_pvt_thread_mutex_destroy( &attr_mutex );
+ return 0;
+}
projects / openldap / blobdiff