X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fvalue.c;h=1c4379866dcc2a76c1a461416a5e27decceec305;hb=93390425dfe797a3fa7abfdc76f99b9c4c2536ee;hp=e4b9ee0ed6c4ea05ae9e61947c6f629cf385febd;hpb=7cb1176502538530e971dad302dc3383b0f2373e;p=openldap

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index e4b9ee0ed6..1c4379866d 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,8 +1,28 @@
 /* value.c - routines for dealing with values */
 /* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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>.
+ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ * 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.
  */
 
 #include "portable.h"
@@ -20,100 +40,166 @@
 
 int
 value_add( 
-    struct berval	***vals,
-    struct berval	**addvals
+    BerVarray *vals,
+    BerVarray addvals
 )
 {
-	int	n, nn, i, j;
+	int	n, nn;
+	BerVarray v2;
 
-	for ( nn = 0; addvals != NULL && addvals[nn] != NULL; nn++ )
+	for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
 		;	/* NULL */
 
 	if ( *vals == NULL ) {
-		*vals = (struct berval **) ch_malloc( (nn + 1)
-		    * sizeof(struct berval *) );
+		*vals = (BerVarray) SLAP_MALLOC( (nn + 1)
+		    * sizeof(struct berval) );
+		if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+			 LDAP_LOG( OPERATION, ERR,
+		      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+			Debug(LDAP_DEBUG_TRACE,
+		      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+			return LBER_ERROR_MEMORY;
+		}
 		n = 0;
 	} else {
-		for ( n = 0; (*vals)[n] != NULL; n++ )
-			;	/* NULL */
-		*vals = (struct berval **) ch_realloc( (char *) *vals,
-		    (n + nn + 1) * sizeof(struct berval *) );
+		for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+			;	/* Empty */
+		}
+		*vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
+		    (n + nn + 1) * sizeof(struct berval) );
+		if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+			 LDAP_LOG( OPERATION, ERR,
+		      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+			Debug(LDAP_DEBUG_TRACE,
+		      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+			return LBER_ERROR_MEMORY;
+		}
 	}
 
-	for ( i = 0, j = 0; i < nn; i++ ) {
-		if ( addvals[i]->bv_len > 0 ) {
-			(*vals)[n + j] = ber_bvdup( addvals[i] );
-			if( (*vals)[n + j++] == NULL ) break;
-		}
+	v2 = *vals + n;
+	for ( ; addvals->bv_val; v2++, addvals++ ) {
+		ber_dupbv(v2, addvals);
+		if (v2->bv_val == NULL) break;
 	}
-	(*vals)[n + j] = NULL;
+	v2->bv_val = NULL;
+	v2->bv_len = 0;
 
 	return LDAP_SUCCESS;
 }
 
-
 int
-value_normalize(
+value_add_one( 
+    BerVarray *vals,
+    struct berval *addval
+)
+{
+	int	n;
+	BerVarray v2;
+
+	if ( *vals == NULL ) {
+		*vals = (BerVarray) SLAP_MALLOC( 2 * sizeof(struct berval) );
+		if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+			 LDAP_LOG( OPERATION, ERR,
+		      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+			Debug(LDAP_DEBUG_TRACE,
+		      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+			return LBER_ERROR_MEMORY;
+		}
+		n = 0;
+	} else {
+		for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+			;	/* Empty */
+		}
+		*vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
+		    (n + 2) * sizeof(struct berval) );
+		if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+			 LDAP_LOG( OPERATION, ERR,
+		      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+			Debug(LDAP_DEBUG_TRACE,
+		      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+			return LBER_ERROR_MEMORY;
+		}
+	}
+
+	v2 = *vals + n;
+	ber_dupbv(v2, addval);
+
+	v2++;
+	v2->bv_val = NULL;
+	v2->bv_len = 0;
+
+	return LDAP_SUCCESS;
+}
+
+int asserted_value_validate_normalize( 
 	AttributeDescription *ad,
+	MatchingRule *mr,
 	unsigned usage,
 	struct berval *in,
-	struct berval **out,
-	const char **text )
+	struct berval *out,
+	const char ** text,
+	void *ctx )
 {
 	int rc;
-	MatchingRule *mr;
-
-	switch( usage & SLAP_MR_TYPE_MASK ) {
-	case SLAP_MR_NONE:
-	case SLAP_MR_EQUALITY:
-		mr = ad->ad_type->sat_equality;
-		break;
-	case SLAP_MR_ORDERING:
-		mr = ad->ad_type->sat_ordering;
-		break;
-	case SLAP_MR_SUBSTR:
-		mr = ad->ad_type->sat_substr;
-		break;
-	case SLAP_MR_EXT:
-	default:
-		assert( 0 );
-		*text = "internal error";
-		return LDAP_OTHER;
-	}
+	struct berval pval;
+	pval.bv_val = NULL;
+
+	/* we expect the value to be in the assertion syntax */
+	assert( !SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) );
 
 	if( mr == NULL ) {
 		*text = "inappropriate matching request";
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	/* we only support equality matching of binary attributes */
-	if( slap_ad_is_binary( ad ) && usage != SLAP_MR_EQUALITY ) {
-		*text = "inappropriate binary matching";
+	if( !mr->smr_match ) {
+		*text = "requested matching rule not supported";
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	if( mr->smr_normalize ) {
-		rc = (mr->smr_normalize)( usage,
-			ad->ad_type->sat_syntax,
-			mr, in, out );
+	if( mr->smr_syntax->ssyn_pretty ) {
+		rc = (mr->smr_syntax->ssyn_pretty)( mr->smr_syntax, in, &pval, ctx );
+		in = &pval;
 
-		if( rc != LDAP_SUCCESS ) {
-			*text = "unable to normalize value";
-			return LDAP_INVALID_SYNTAX;
-		}
+	} else {
+		rc = (mr->smr_syntax->ssyn_validate)( mr->smr_syntax, in );
+	}
+
+	if( rc != LDAP_SUCCESS ) {
+		*text = "value does not conform to assertion syntax";
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	if( mr->smr_normalize ) {
+		rc = (mr->smr_normalize)(
+			usage|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+			ad ? ad->ad_type->sat_syntax : NULL,
+			mr, in, out, ctx );
 
-	} else if ( mr->smr_syntax->ssyn_normalize ) {
-		rc = (mr->smr_syntax->ssyn_normalize)(
-			ad->ad_type->sat_syntax,
-			in, out );
+		if( pval.bv_val ) ber_memfree_x( pval.bv_val, ctx );
 
 		if( rc != LDAP_SUCCESS ) {
-			*text = "unable to normalize value";
+			*text = "unable to normalize value for matching";
 			return LDAP_INVALID_SYNTAX;
 		}
 
+	} else if ( pval.bv_val != NULL ) {
+		*out = pval;
+
 	} else {
-		*out = ber_bvdup( in );
+		ber_dupbv_x( out, in, ctx );
 	}
 
 	return LDAP_SUCCESS;
@@ -131,68 +217,70 @@ value_match(
 	const char ** text )
 {
 	int rc;
-	struct berval *nv1 = NULL;
+	struct berval nv1 = { 0, NULL };
+	struct berval nv2 = { 0, NULL };
+
+	assert( mr != NULL );
 
 	if( !mr->smr_match ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	if( ad->ad_type->sat_syntax->ssyn_normalize ) {
-		rc = ad->ad_type->sat_syntax->ssyn_normalize(
-			ad->ad_type->sat_syntax, v1, &nv1 );
-
-		if( rc != LDAP_SUCCESS ) {
-			return LDAP_INAPPROPRIATE_MATCHING;
-		}
-	}
-
 	rc = (mr->smr_match)( match, flags,
 		ad->ad_type->sat_syntax,
 		mr,
-		nv1 != NULL ? nv1 : v1,
-		v2 );
+		nv1.bv_val != NULL ? &nv1 : v1,
+		nv2.bv_val != NULL ? &nv2 : v2 );
 	
-	ber_bvfree( nv1 );
+	if (nv1.bv_val ) free( nv1.bv_val );
+	if (nv2.bv_val ) free( nv2.bv_val );
 	return rc;
 }
 
-
-int value_find(
+int value_find_ex(
 	AttributeDescription *ad,
-	struct berval **vals,
-	struct berval *val )
+	unsigned flags,
+	BerVarray vals,
+	struct berval *val,
+	void *ctx )
 {
 	int	i;
 	int rc;
-	struct berval *nval = NULL;
+	struct berval nval = { 0, NULL };
 	MatchingRule *mr = ad->ad_type->sat_equality;
 
 	if( mr == NULL || !mr->smr_match ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	if( mr->smr_syntax->ssyn_normalize ) {
-		rc = mr->smr_syntax->ssyn_normalize(
-			mr->smr_syntax, val, &nval );
+	assert(SLAP_IS_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH( flags ));
+
+	if( !SLAP_IS_MR_ASSERTED_VALUE_NORMALIZED_MATCH( flags ) &&
+		mr->smr_normalize )
+	{
+		rc = (mr->smr_normalize)(
+			flags & (SLAP_MR_TYPE_MASK|SLAP_MR_SUBTYPE_MASK|SLAP_MR_VALUE_OF_SYNTAX),
+			ad ? ad->ad_type->sat_syntax : NULL,
+			mr, val, &nval, ctx );
 
 		if( rc != LDAP_SUCCESS ) {
-			return LDAP_INAPPROPRIATE_MATCHING;
+			return LDAP_INVALID_SYNTAX;
 		}
 	}
 
-	for ( i = 0; vals[i] != NULL; i++ ) {
+	for ( i = 0; vals[i].bv_val != NULL; i++ ) {
 		int match;
 		const char *text;
 
-		rc = value_match( &match, ad, mr, 0,
-			vals[i], nval == NULL ? val : nval, &text );
+		rc = value_match( &match, ad, mr, flags,
+			&vals[i], nval.bv_val == NULL ? val : &nval, &text );
 
 		if( rc == LDAP_SUCCESS && match == 0 ) {
-			ber_bvfree( nval );
-			return LDAP_SUCCESS;
+			sl_free( nval.bv_val, ctx );
+			return rc;
 		}
 	}
 
-	ber_bvfree( nval );
+	sl_free( nval.bv_val, ctx );
 	return LDAP_NO_SUCH_ATTRIBUTE;
 }