/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
attr_alloc( AttributeDescription *ad )
{
Attribute *a;
-
-
+
ldap_pvt_thread_mutex_lock( &attr_mutex );
if ( !attr_list )
attr_prealloc( CHUNK_SIZE );
void
-attr_free( Attribute *a )
+attr_clean( Attribute *a )
{
if ( a->a_nvals && a->a_nvals != a->a_vals &&
!( a->a_flags & SLAP_ATTR_DONT_FREE_VALS )) {
ber_bvarray_free( a->a_vals );
}
}
- memset( a, 0, sizeof( Attribute ));
+ 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 )
+{
+ attr_clean( a );
ldap_pvt_thread_mutex_lock( &attr_mutex );
a->a_next = attr_list;
attr_list = a;
void
attrs_free( Attribute *a )
{
- Attribute *next;
-
- for( ; a != NULL ; a = next ) {
- next = a->a_next;
- attr_free( a );
+ 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 );
}
}
-Attribute *
-attr_dup( Attribute *a )
+static void
+attr_dup2( Attribute *tmp, Attribute *a )
{
- Attribute *tmp;
-
- if ( a == NULL) return NULL;
-
- tmp = attr_alloc( a->a_desc );
-
if ( a->a_vals != NULL ) {
int i;
} else {
tmp->a_nvals = tmp->a_vals;
}
-
- } else {
- tmp->a_vals = NULL;
- tmp->a_nvals = NULL;
}
+}
+
+Attribute *
+attr_dup( Attribute *a )
+{
+ Attribute *tmp;
+
+ if ( a == NULL) return NULL;
+
+ tmp = attr_alloc( a->a_desc );
+ attr_dup2( tmp, a );
return tmp;
}
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;
}
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;
+
+ *nvalsp = NULL;
if ( desc->ad_type->sat_equality &&
desc->ad_type->sat_equality->smr_normalize )
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)(
+ rc = desc->ad_type->sat_equality->smr_normalize(
SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
desc->ad_type->sat_syntax,
desc->ad_type->sat_equality,
if ( rc != LDAP_SUCCESS ) {
BER_BVZERO( &nvals[i + 1] );
- goto error_return;
+ break;
}
}
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;
}
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,
+ struct berval *nval,
void *memctx )
{
- struct berval nval;
- struct berval *nvalp = NULL;
- int rc;
+ int rc = LDAP_SUCCESS;
+
+ BER_BVZERO( nval );
if ( desc->ad_type->sat_equality &&
desc->ad_type->sat_equality->smr_normalize )
{
- rc = (*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;
}
projects / openldap / blobdiff