X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=55a65b55eddb820d2638bfb4f917b9b54c078c55;hb=8a465da10c1a9c76cac9174c37bd854fd3e9d0ab;hp=599b89193a6f78f93f93a75f6b94d6d4ea00923d;hpb=4d22b569debb8b72f7bc2cd614bf46af4a4cdc39;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 599b89193a..55a65b55ed 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,9 +1,28 @@
+/* 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-2005 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"
 
@@ -26,9 +45,7 @@ void
 attr_free( Attribute *a )
 {
 	ber_bvarray_free( a->a_vals );
-#ifdef SLAP_NVALUES
 	if (a->a_nvals != a->a_vals) ber_bvarray_free( a->a_nvals );
-#endif
 	free( a );
 }
 
@@ -43,47 +60,49 @@ 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( 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;
 
-#ifdef SLAP_NVALUES
-		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( tmp->a_nvals[i].bv_val == NULL ) break;
+				if ( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+				/* FIXME: error? */
 			}
 			tmp->a_nvals[i].bv_val = NULL;
 
 		} else {
 			tmp->a_nvals = tmp->a_vals;
 		}
-#endif
 
 	} else {
 		tmp->a_vals = NULL;
-#ifdef SLAP_NVALUES
 		tmp->a_nvals = NULL;
-#endif
 	}
 
 	tmp->a_desc = a->a_desc;
@@ -93,7 +112,8 @@ Attribute *attr_dup( Attribute *a )
 	return tmp;
 }
 
-Attribute *attrs_dup( Attribute *a )
+Attribute *
+attrs_dup( Attribute *a )
 {
 	Attribute *tmp, **next;
 
@@ -117,8 +137,8 @@ Attribute *attrs_dup( Attribute *a )
  * 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.
+ * 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
@@ -128,11 +148,9 @@ int
 attr_merge(
 	Entry		*e,
 	AttributeDescription *desc,
-	BerVarray	vals
-#ifdef SLAP_NVALUES
-	, BerVarray	nvals
-#endif
-) {
+	BerVarray	vals,
+	BerVarray	nvals )
+{
 	int rc;
 
 	Attribute	**a;
@@ -147,20 +165,64 @@ attr_merge(
 		*a = (Attribute *) ch_malloc( sizeof(Attribute) );
 		(*a)->a_desc = desc;
 		(*a)->a_vals = NULL;
-#ifdef SLAP_NVALUES
 		(*a)->a_nvals = NULL;
-#endif
 		(*a)->a_next = NULL;
 		(*a)->a_flags = 0;
 	}
 
 	rc = value_add( &(*a)->a_vals, vals );
 
-#ifdef SLAP_NVALUES
-	if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
-	else (*a)->a_nvals = (*a)->a_vals;
-#endif
+	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
+attr_merge_normalize(
+	Entry		*e,
+	AttributeDescription *desc,
+	BerVarray	vals,
+	void	 *memctx )
+{
+	BerVarray	nvals = NULL;
+	int		rc;
+
+	if ( desc->ad_type->sat_equality &&
+		desc->ad_type->sat_equality->smr_normalize )
+	{
+		int	i;
+		
+		for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ );
+
+		nvals = 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 ) {
+				BER_BVZERO( &nvals[i + 1] );
+				goto error_return;
+			}
+		}
+		nvals[i].bv_val = NULL;
+	}
+
+	rc = attr_merge( e, desc, vals, nvals );
 
+error_return:;
+	if ( nvals != NULL ) {
+		ber_bvarray_free_x( nvals, memctx );
+	}
 	return rc;
 }
 
@@ -168,11 +230,9 @@ int
 attr_merge_one(
 	Entry		*e,
 	AttributeDescription *desc,
-	struct berval	*val
-#ifdef SLAP_NVALUES
-	, struct berval *nval
-#endif
-) {
+	struct berval	*val,
+	struct berval	*nval )
+{
 	int rc;
 	Attribute	**a;
 
@@ -186,19 +246,54 @@ attr_merge_one(
 		*a = (Attribute *) ch_malloc( sizeof(Attribute) );
 		(*a)->a_desc = desc;
 		(*a)->a_vals = NULL;
-#ifdef SLAP_NVALUES
 		(*a)->a_nvals = NULL;
-#endif
 		(*a)->a_next = NULL;
 		(*a)->a_flags = 0;
 	}
 
 	rc = value_add_one( &(*a)->a_vals, val );
 
-#ifdef SLAP_NVALUES
-	if( !rc && nval ) rc = value_add_one( &(*a)->a_nvals, nval );
-	else (*a)->a_nvals = (*a)->a_vals;
-#endif
+	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;
+}
+
+int
+attr_merge_normalize_one(
+	Entry		*e,
+	AttributeDescription *desc,
+	struct berval	*val,
+	void		*memctx )
+{
+	struct berval	nval;
+	struct berval	*nvalp = NULL;
+	int		rc;
+
+	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 );
+
+		if ( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
+		nvalp = &nval;
+	}
+
+	rc = attr_merge_one( e, desc, val, nvalp );
+	if ( nvalp != NULL ) {
+		sl_free( nval.bv_val, memctx );
+	}
 	return rc;
 }
 
@@ -210,8 +305,7 @@ attr_merge_one(
 Attribute *
 attrs_find(
     Attribute	*a,
-	AttributeDescription *desc
-)
+	AttributeDescription *desc )
 {
 	for ( ; a != NULL; a = a->a_next ) {
 		if ( is_ad_subtype( a->a_desc, desc ) ) {
@@ -229,8 +323,7 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute	*a,
-	AttributeDescription *desc
-)
+	AttributeDescription *desc )
 {
 	for ( ; a != NULL; a = a->a_next ) {
 		if ( ad_cmp( a->a_desc, desc ) == 0 ) {
@@ -251,8 +344,7 @@ attr_find(
 int
 attr_delete(
     Attribute	**attrs,
-	AttributeDescription *desc
-)
+	AttributeDescription *desc )
 {
 	Attribute	**a;