X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmra.c;h=52f5e11a6c9696bb58d32250c3fbffd2f7206abf;hb=bd1543ce44c8478d8785cabbe449516167d72141;hp=a92f87bee907a60ac6102dbbf8dc527fde7cd0fe;hpb=9b4bf8a973c8cfea809be9a4b658f785a6b16f2f;p=openldap

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index a92f87bee9..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-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-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"
 
@@ -16,18 +25,21 @@
 
 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
@@ -38,7 +50,7 @@ get_mra(
 	ber_len_t length;
 	struct berval type = { 0, NULL };
 	struct berval value = { 0, NULL };
-	struct berval tmp = { 0, NULL };
+	struct berval rule_text = { 0, NULL };
 	MatchingRuleAssertion ma;
 
 	memset( &ma, 0, sizeof ma);
@@ -58,7 +70,7 @@ get_mra(
 	}
 
 	if ( tag == LDAP_FILTER_EXT_OID ) {
-		rtag = ber_scanf( ber, "m", &tmp );
+		rtag = ber_scanf( ber, "m", &rule_text );
 		if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG( OPERATION, ERR,
@@ -70,7 +82,6 @@ get_mra(
 			*text = "Error parsing matching rule in matching rule assertion";
 			return SLAPD_DISCONNECT;
 		}
-		ber_dupbv( &ma.ma_rule_text, &tmp );
 
 		rtag = ber_scanf( ber, "t", &tag );
 		if( rtag == LBER_ERROR ) {
@@ -166,8 +177,8 @@ get_mra(
 		}
 	}
 
-	if( ma.ma_rule_text.bv_val != NULL ) {
-		ma.ma_rule = mr_bvfind( &ma.ma_rule_text );
+	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;
@@ -202,41 +213,31 @@ get_mra(
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
 
-#ifndef SLAP_NVALUES
-		/*
-		 * OK, if no matching rule, normalize for equality, otherwise
-		 * normalize for the matching rule.
-		 */
-		rc = value_validate_normalize( ma.ma_desc, SLAP_MR_EQUALITY,
-			&value, &ma.ma_value, text );
-	} else {
-		/*
-		 * Need to normalize, but how?
-		 */
-		rc = value_validate( ma.ma_rule, &value, text );
-		if ( rc == LDAP_SUCCESS ) {
-			ber_dupbv( &ma.ma_value, &value );
-		}
-#endif
 	}
 
-#ifdef SLAP_NVALUES
 	/*
 	 * Normalize per matching rule
 	 */
 	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 );
-#endif
+		&value, &ma.ma_value, text, op->o_tmpmemctx );
 
 	if( rc != LDAP_SUCCESS ) {
 		return rc;
 	}
 
-	*mra = ch_malloc( sizeof 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;
 }
-