X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=d1023d96231ce053d6176a926cfe5cc7219bba0c;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=dd36a7ea0f52d1ea98ab9e06a23f05d081fe13b3;hpb=4bc786f34b50aa301be6f5600f58a980070f481e;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dd36a7ea0f..d1023d9623 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,6 +1,6 @@
 /* $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 */
@@ -22,19 +22,11 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 
-#ifdef LDAP_DEBUG
-static void at_index_print( void );
-#endif
-
 void
 attr_free( Attribute *a )
 {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	ad_free( a->a_desc, 1 );
-#else
-	free( a->a_type );
-#endif
-	ber_bvecfree( a->a_vals );
+	ber_bvarray_free( a->a_vals );
+	if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
 	free( a );
 }
 
@@ -60,31 +52,37 @@ Attribute *attr_dup( Attribute *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*));
+		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].bv_val = NULL;
 
-		for( i=0; a->a_vals[i] != NULL; i++ ) {
-			tmp->a_vals[i] = ber_bvdup( a->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++ ) {
+				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;
 
-			if( tmp->a_vals[i] == NULL ) break;
+		} else {
+			tmp->a_nvals = tmp->a_vals;
 		}
 
-		tmp->a_vals[i] = NULL;
-
 	} else {
 		tmp->a_vals = NULL;
+		tmp->a_nvals = NULL;
 	}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	tmp->a_desc = ad_dup( a->a_desc );
-#else
-	tmp->a_type = ch_strdup( a->a_type );
-	tmp->a_syntax = a->a_syntax;
-#endif
+	tmp->a_desc = a->a_desc;
 	tmp->a_next = NULL;
+	tmp->a_flags = 0;
 
 	return tmp;
 }
@@ -107,108 +105,150 @@ Attribute *attrs_dup( Attribute *a )
 	return tmp;
 }
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-/*
- * attr_normalize - normalize an attribute name (make it all lowercase)
- */
-
-char *
-attr_normalize( char *s )
-{
-	assert( s != NULL );
 
-	return( ldap_pvt_str2lower( s ) );
-}
-#endif
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
 /*
- * attr_merge_fast - merge the given type and value with the list of
- * attributes in attrs. called from str2entry(), where we can make some
- * assumptions to make things faster.
+ * attr_merge - merge the given type and value with the list of
+ * attributes in attrs.
+ *
+ * For SLAP_NVALUES: nvals must be NULL if the attribute has no
+ * normalizer. In this case, a->a_nvals will be set equal to a->a_vals.
+ *
  * returns	0	everything went ok
  *		-1	trouble
  */
 
 int
-attr_merge_fast(
-    Entry		*e,
-    const char		*type,
-    struct berval	**vals,
-    int			nvals,
-    int			naddvals,
-    int			*maxvals,
-    Attribute		***a
-)
-{
-	if ( *a == NULL ) {
-		for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-			/* not yet implemented */
-#else
-			if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
-				break;
-			}
-#endif
+attr_merge(
+	Entry		*e,
+	AttributeDescription *desc,
+	BerVarray	vals,
+	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 ) {
+			break;
 		}
 	}
 
-	if ( **a == NULL ) {
-		**a = (Attribute *) ch_malloc( sizeof(Attribute) );
-		(**a)->a_vals = NULL;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-		(**a)->a_type = attr_normalize( ch_strdup( type ) );
-		(**a)->a_syntax = attr_syntax( type );
-#endif
-		(**a)->a_next = NULL;
+	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;
 	}
 
-	return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals,
-	    maxvals ) );
+	rc = value_add( &(*a)->a_vals, vals );
+
+	if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
+	else (*a)->a_nvals = (*a)->a_vals;
+
+	return rc;
 }
-#endif
 
-/*
- * attr_merge - merge the given type and value with the list of
- * attributes in attrs.
- * returns	0	everything went ok
- *		-1	trouble
- */
+int
+attr_merge_normalize(
+	Entry		*e,
+	AttributeDescription *desc,
+	BerVarray	vals,
+	void	 *memctx
+) {
+	BerVarray	nvals = NULL;
+	int		rc;
+
+	if ( desc->ad_type->sat_equality->smr_normalize ) {
+		int	i;
+		
+		for ( i = 0; vals[i].bv_val; i++);
+
+		nvals = ch_calloc( sizeof(struct berval), i + 1 );
+		for ( i = 0; vals[i].bv_val; i++ ) {
+			rc = (*desc->ad_type->sat_equality->smr_normalize)(
+					0,
+					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;
+			}
+		}
+		nvals[i].bv_val = NULL;
+	}
+
+	rc = attr_merge( e, desc, vals, nvals );
+
+error_return:;
+	ber_bvarray_free( nvals );
+	return rc;
+}
 
 int
-attr_merge(
-    Entry		*e,
-    const char		*type,
-    struct berval	**vals )
-{
+attr_merge_one(
+	Entry		*e,
+	AttributeDescription *desc,
+	struct berval	*val,
+	struct berval	*nval
+) {
+	int rc;
 	Attribute	**a;
 
 	for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-		/* not yet implemented */
-#else
-		if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
 			break;
 		}
-#endif
 	}
 
 	if ( *a == NULL ) {
 		*a = (Attribute *) ch_malloc( sizeof(Attribute) );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-		/* not yet implemented */
-#else
-		(*a)->a_type = attr_normalize( ch_strdup( type ) );
-		(*a)->a_syntax = attr_syntax( type );
-#endif
+		(*a)->a_desc = desc;
 		(*a)->a_vals = NULL;
+		(*a)->a_nvals = NULL;
 		(*a)->a_next = NULL;
+		(*a)->a_flags = 0;
+	}
+
+	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;
+	return rc;
+}
+
+int
+attr_merge_normalize_one(
+	Entry		*e,
+	AttributeDescription *desc,
+	struct berval	*val,
+	void		*memctx
+) {
+	struct berval	nval;
+	int		rc;
+
+	if ( desc->ad_type->sat_equality->smr_normalize ) {
+		rc = (*desc->ad_type->sat_equality->smr_normalize)(
+				0,
+				desc->ad_type->sat_syntax,
+				desc->ad_type->sat_equality,
+				val, &nval, memctx );
+
+		if ( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
 	}
 
-	return( value_add( &(*a)->a_vals, vals ) );
+	rc = attr_merge_one( e, desc, val, &nval );
+	ch_free( nval.bv_val );
+	return rc;
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 /*
  * attrs_find - find attribute(s) by AttributeDescription
  * returns next attribute which is subtype of provided description.
@@ -221,14 +261,13 @@ attrs_find(
 )
 {
 	for ( ; a != NULL; a = a->a_next ) {
-		if ( is_ad_subtype( a->a_desc, desc ) == 0 ) {
+		if ( is_ad_subtype( a->a_desc, desc ) ) {
 			return( a );
 		}
 	}
 
 	return( NULL );
 }
-#endif
 
 /*
  * attr_find - find attribute by type
@@ -237,20 +276,11 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute	*a,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	AttributeDescription *desc
-#else
-	const char	*type
-#endif
 )
 {
 	for ( ; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-		if ( ad_cmp( a->a_desc, desc ) == 0 )
-#else
-		if ( strcasecmp( a->a_type, type ) == 0 )
-#endif
-		{
+		if ( ad_cmp( a->a_desc, desc ) == 0 ) {
 			return( a );
 		}
 	}
@@ -268,34 +298,21 @@ attr_find(
 int
 attr_delete(
     Attribute	**attrs,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	AttributeDescription *desc
-#else
-    const char	*type
-#endif
 )
 {
 	Attribute	**a;
-	Attribute	*save;
 
 	for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-		/* not yet implemented */
-#else
-		if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
-			break;
-		}
-#endif
-	}
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+			Attribute	*save = *a;
+			*a = (*a)->a_next;
+			attr_free( save );
 
-	if ( *a == NULL ) {
-		return( 1 );
+			return LDAP_SUCCESS;
+		}
 	}
 
-	save = *a;
-	*a = (*a)->a_next;
-	attr_free( save );
-
-	return( 0 );
+	return LDAP_NO_SUCH_ATTRIBUTE;
 }