X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmra.c;h=52f5e11a6c9696bb58d32250c3fbffd2f7206abf;hb=e2483d8a9bc7fa72bac53d8af3ed215d3a1d80d0;hp=81db86ae7687473872714cc5460984a353f91f45;hpb=26b99bc35dd1616cb986890bfe3fb130ffb9a8a4;p=openldap

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index 81db86ae76..52f5e11a6c 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -1,9 +1,18 @@
+/* mra.c - routines for dealing with extensible matching rule assertions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-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>.
  */
-/* mra.c - routines for dealing with extensible matching rule assertions */
 
 #include "portable.h"
 
@@ -14,21 +23,23 @@
 
 #include "slap.h"
 
-
 void
 mra_free(
+	Operation *op,
 	MatchingRuleAssertion *mra,
 	int	freeit
 )
 {
+	/* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
 	ch_free( mra->ma_value.bv_val );
 	if ( freeit ) {
-		ch_free( (char *) mra );
+		op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
 	}
 }
 
 int
 get_mra(
+	Operation *op,
 	BerElement	*ber,
 	MatchingRuleAssertion	**mra,
 	const char **text
@@ -37,59 +48,51 @@ get_mra(
 	int rc;
 	ber_tag_t tag, rtag;
 	ber_len_t length;
-	struct berval type = { 0, NULL }, value;
-	MatchingRuleAssertion *ma;
+	struct berval type = { 0, NULL };
+	struct berval value = { 0, NULL };
+	struct berval rule_text = { 0, NULL };
+	MatchingRuleAssertion ma;
 
-	ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
-	ma->ma_rule = NULL;
-	ma->ma_rule_text.bv_len = 0;
-	ma->ma_rule_text.bv_val = NULL;
-	ma->ma_desc = NULL;
-	ma->ma_dnattrs = 0;
-	ma->ma_value.bv_len = 0;
-	ma->ma_value.bv_val = NULL;
+	memset( &ma, 0, sizeof ma);
 
-	rtag = ber_scanf( ber, "{t", &tag );
+	rtag = ber_scanf( ber, "{t" /*"}"*/, &tag );
 
 	if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "get_mra: ber_scanf (\"{t\") failure\n" ));
+		LDAP_LOG( OPERATION, ERR, 
+			"get_mra: ber_scanf (\"{t\") failure\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
 #endif
 
 		*text = "Error parsing matching rule assertion";
-		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
 	if ( tag == LDAP_FILTER_EXT_OID ) {
-		rtag = ber_scanf( ber, "m", &ma->ma_rule_text );
+		rtag = ber_scanf( ber, "m", &rule_text );
 		if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "get_mra: ber_scanf(\"o\") failure.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "get_mra: ber_scanf(\"o\") failure.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf for mr\n", 0, 0, 0 );
 #endif
 
 			*text = "Error parsing matching rule in matching rule assertion";
-			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
 
 		rtag = ber_scanf( ber, "t", &tag );
 		if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "get_mra: ber_scanf (\"t\") failure\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "get_mra: ber_scanf (\"t\") failure\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
 #endif
 
 			*text = "Error parsing matching rule assertion";
-			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
 	}
@@ -98,8 +101,8 @@ get_mra(
 		rtag = ber_scanf( ber, "m", &type );
 		if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "get_mra: ber_scanf (\"o\") failure.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf for ad\n", 0, 0, 0 );
 #endif
@@ -111,28 +114,26 @@ get_mra(
 		rtag = ber_scanf( ber, "t", &tag );
 		if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "get_mra: ber_scanf (\"t\") failure.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "get_mra: ber_scanf (\"t\") failure.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
 #endif
 
 			*text = "Error parsing matching rule assertion";
-			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
 	}
 
 	if ( tag != LDAP_FILTER_EXT_VALUE ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "get_mra: ber_scanf missing value\n" ));
+		LDAP_LOG( OPERATION, ERR, 
+			"get_mra: ber_scanf missing value\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf missing value\n", 0, 0, 0 );
 #endif
 
 		*text = "Missing value in matching rule assertion";
-		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
@@ -140,101 +141,103 @@ get_mra(
 
 	if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "get_mra: ber_scanf (\"o\") failure.\n" ));
+		LDAP_LOG( OPERATION, ERR, 
+			"get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
 #endif
 
 		*text = "Error decoding value in matching rule assertion";
-		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
 	tag = ber_peek_tag( ber, &length );
 
 	if ( tag == LDAP_FILTER_EXT_DNATTRS ) {
-		rtag = ber_scanf( ber, "b}", &ma->ma_dnattrs );
+		rtag = ber_scanf( ber, /*"{"*/ "b}", &ma.ma_dnattrs );
 	} else {
-		rtag = ber_scanf( ber, "}" );
+		rtag = ber_scanf( ber, /*"{"*/ "}" );
 	}
 
 	if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "get_mra: ber_scanf failure\n"));
+		LDAP_LOG( OPERATION, ERR, "get_mra: ber_scanf failure\n", 0, 0, 0);
 #else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
 #endif
 
 		*text = "Error decoding dnattrs matching rule assertion";
-		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
-	if( ma->ma_dnattrs ) {
-		*text = "matching with \":dn\" not supported";
-		return LDAP_INAPPROPRIATE_MATCHING;
-	}
-
 	if( type.bv_val != NULL ) {
-		rc = slap_bv2ad( &type, &ma->ma_desc, text );
+		rc = slap_bv2ad( &type, &ma.ma_desc, text );
 		if( rc != LDAP_SUCCESS ) {
-			mra_free( ma, 1 );
 			return rc;
 		}
-
-	} else {
-		*text = "matching without attribute description rule not supported";
-		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	if( ma->ma_rule_text.bv_val != NULL ) {
-		ma->ma_rule = mr_bvfind( &ma->ma_rule_text );
-		if( ma->ma_rule == NULL ) {
-			mra_free( ma, 1 );
+	if( rule_text.bv_val != NULL ) {
+		ma.ma_rule = mr_bvfind( &rule_text );
+		if( ma.ma_rule == NULL ) {
 			*text = "matching rule not recognized";
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
 	}
 
-	if( ma->ma_desc != NULL &&
-		ma->ma_desc->ad_type->sat_equality != NULL &&
-		ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
-	{
-		/* no matching rule was provided, use the attribute's
-		   equality rule if it supports extensible matching. */
-		ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
+	if ( ma.ma_rule == NULL ) {
+		/*
+		 * Need either type or rule ...
+		 */
+		if ( ma.ma_desc == NULL ) {
+			*text = "no matching rule or type";
+			return LDAP_INAPPROPRIATE_MATCHING;
+		}
 
-	} else {
-		mra_free( ma, 1 );
-		return LDAP_INAPPROPRIATE_MATCHING;
+		if ( ma.ma_desc->ad_type->sat_equality != NULL &&
+			ma.ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
+		{
+			/* no matching rule was provided, use the attribute's
+			   equality rule if it supports extensible matching. */
+			ma.ma_rule = ma.ma_desc->ad_type->sat_equality;
+
+		} else {
+			*text = "no appropriate rule to use for type";
+			return LDAP_INAPPROPRIATE_MATCHING;
+		}
 	}
 
-	/* check to see if the matching rule is appropriate for
-	   the syntax of the attribute.  This check will need
-	   to be extended to support other kinds of extensible
-	   matching rules */
-	if( strcmp( ma->ma_rule->smr_syntax->ssyn_oid,
-		ma->ma_desc->ad_type->sat_syntax->ssyn_oid ) != 0 )
-	{
-		mra_free( ma, 1 );
-		return LDAP_INAPPROPRIATE_MATCHING;
+	if ( ma.ma_desc != NULL ) {
+		if( !mr_usable_with_at( ma.ma_rule, ma.ma_desc->ad_type ) ) {
+			*text = "matching rule use with this attribute not appropriate";
+			return LDAP_INAPPROPRIATE_MATCHING;
+		}
+
 	}
 
 	/*
-	 * OK, if no matching rule, normalize for equality, otherwise
-	 * normalize for the matching rule.
+	 * Normalize per matching rule
 	 */
-	rc = value_validate_normalize( ma->ma_desc, SLAP_MR_EQUALITY,
-		&value, &ma->ma_value, text );
+	rc = asserted_value_validate_normalize( ma.ma_desc,
+		ma.ma_rule,
+		SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+		&value, &ma.ma_value, text, op->o_tmpmemctx );
 
 	if( rc != LDAP_SUCCESS ) {
-		mra_free( ma, 1 );
 		return rc;
 	}
 
-	*mra = ma;
+	length = sizeof(ma);
+	/* Append rule_text to end of struct */
+	if (rule_text.bv_val) length += rule_text.bv_len + 1;
+	*mra = op->o_tmpalloc( length, op->o_tmpmemctx );
+	**mra = ma;
+	if (rule_text.bv_val) {
+		(*mra)->ma_rule_text.bv_len = rule_text.bv_len;
+		(*mra)->ma_rule_text.bv_val = (char *)(*mra+1);
+		AC_MEMCPY((*mra)->ma_rule_text.bv_val, rule_text.bv_val,
+			rule_text.bv_len+1);
+	}
+
 	return LDAP_SUCCESS;
 }
-