#include <ac/string.h>
#include <ac/time.h>
-#include "ldap_pvt.h"
#include "slap.h"
+#ifdef LDAP_COMP_MATCH
+extern free_component_func* component_destructor;
+#endif
void
attr_free( Attribute *a )
{
+ if ( a->a_nvals && a->a_nvals != a->a_vals )
+ ber_bvarray_free( a->a_nvals );
ber_bvarray_free( a->a_vals );
- if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
+#ifdef LDAP_COMP_MATCH
+ if ( component_destructor && a->a_comp_data && a->a_comp_data->cd_mem_op ) {
+ component_destructor( a->a_comp_data->cd_mem_op );
+ free ( a->a_comp_data );
+ }
+#endif
free( a );
}
}
}
-Attribute *attr_dup( Attribute *a )
+Attribute *
+attr_dup( Attribute *a )
{
Attribute *tmp;
- if( a == NULL) return NULL;
+ if ( a == NULL) return NULL;
tmp = ch_malloc( sizeof(Attribute) );
- if( a->a_vals != NULL ) {
+ 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( BER_BVISNULL( &tmp->a_vals[i] ) ) break;
+ if ( BER_BVISNULL( &tmp->a_vals[i] ) ) break;
+ /* FIXME: error? */
}
BER_BVZERO( &tmp->a_vals[i] );
- 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++ ) {
+ /* a_nvals must be non null; it may be equal to a_vals */
+ assert( a->a_nvals );
+
+ if ( a->a_nvals != a->a_vals ) {
+ tmp->a_nvals = ch_malloc( (i + 1) * sizeof(struct berval) );
+ for ( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
- if( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+ if ( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+ /* FIXME: error? */
}
BER_BVZERO( &tmp->a_nvals[i] );
tmp->a_desc = a->a_desc;
tmp->a_next = NULL;
tmp->a_flags = 0;
+#ifdef LDAP_COMP_MATCH
+ tmp->a_comp_data = NULL;
+#endif
return tmp;
}
-Attribute *attrs_dup( Attribute *a )
+Attribute *
+attrs_dup( Attribute *a )
{
Attribute *tmp, **next;
(*a)->a_nvals = NULL;
(*a)->a_next = NULL;
(*a)->a_flags = 0;
+#ifdef LDAP_COMP_MATCH
+ (*a)->a_comp_data = NULL;
+#endif
}
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;
}
{
int i;
- for ( i = 0; vals[i].bv_val; i++ );
+ for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ );
nvals = slap_sl_calloc( sizeof(struct berval), i + 1, memctx );
- for ( i = 0; vals[i].bv_val; i++ ) {
+ 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,
&vals[i], &nvals[i], memctx );
if ( rc != LDAP_SUCCESS ) {
- BER_BVZERO( &nvals[i+1] );
+ BER_BVZERO( &nvals[i + 1] );
goto error_return;
}
}
(*a)->a_nvals = NULL;
(*a)->a_next = NULL;
(*a)->a_flags = 0;
+#ifdef LDAP_COMP_MATCH
+ (*a)->a_comp_data = NULL;
+#endif
}
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;
}
void *memctx )
{
struct berval nval;
- struct berval *nvalp;
+ struct berval *nvalp = NULL;
int rc;
if ( desc->ad_type->sat_equality &&
return rc;
}
nvalp = &nval;
- } else {
- nvalp = NULL;
}
rc = attr_merge_one( e, desc, val, nvalp );