X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=ee0f46daabc5d87fc631f06bb2c5f13295a6d49c;hb=5c3a4e176e9539f58a1ac666ad370b4c204cd44c;hp=762c90cb6f5025d49df038935175307bebe0f94a;hpb=9f6f5491fe55d31cc5eceab59be6bcdc47ea4282;p=openldap
diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 762c90cb6f..ee0f46daab 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,18 +38,35 @@
#include
#include
-#include "ldap_pvt.h"
#include "slap.h"
void
attr_free( Attribute *a )
{
- if ( a->a_nvals && a->a_nvals != a->a_vals )
+ if ( a->a_nvals && a->a_nvals != a->a_vals ) {
ber_bvarray_free( a->a_nvals );
+ }
ber_bvarray_free( a->a_vals );
free( a );
}
+#ifdef LDAP_COMP_MATCH
+void
+comp_tree_free( Attribute *a )
+{
+ Attribute *next;
+
+ for( ; a != NULL ; a = next ) {
+ next = a->a_next;
+ 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
+
void
attrs_free( Attribute *a )
{
@@ -61,33 +78,39 @@ attrs_free( Attribute *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] );
@@ -103,11 +126,15 @@ Attribute *attr_dup( Attribute *a )
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;
@@ -150,7 +177,7 @@ attr_merge(
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;
}
}
@@ -162,12 +189,21 @@ attr_merge(
(*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;
}
@@ -187,10 +223,10 @@ attr_merge_normalize(
{
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,
@@ -198,7 +234,7 @@ attr_merge_normalize(
&vals[i], &nvals[i], memctx );
if ( rc != LDAP_SUCCESS ) {
- BER_BVZERO( &nvals[i+1] );
+ BER_BVZERO( &nvals[i + 1] );
goto error_return;
}
}
@@ -225,7 +261,7 @@ attr_merge_one(
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;
}
}
@@ -237,12 +273,21 @@ attr_merge_one(
(*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;
}
@@ -254,7 +299,7 @@ attr_merge_normalize_one(
void *memctx )
{
struct berval nval;
- struct berval *nvalp;
+ struct berval *nvalp = NULL;
int rc;
if ( desc->ad_type->sat_equality &&
@@ -270,8 +315,6 @@ attr_merge_normalize_one(
return rc;
}
nvalp = &nval;
- } else {
- nvalp = NULL;
}
rc = attr_merge_one( e, desc, val, nvalp );
@@ -310,7 +353,7 @@ attr_find(
AttributeDescription *desc )
{
for ( ; a != NULL; a = a->a_next ) {
- if ( ad_cmp( a->a_desc, desc ) == 0 ) {
+ if ( a->a_desc == desc ) {
return( a );
}
}
@@ -333,7 +376,7 @@ attr_delete(
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 );