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

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index fc2e3e7993..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
@@ -209,7 +221,7 @@ get_mra(
 	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 );
+		&value, &ma.ma_value, text, op->o_tmpmemctx );
 
 	if( rc != LDAP_SUCCESS ) {
 		return rc;
@@ -218,7 +230,7 @@ get_mra(
 	length = sizeof(ma);
 	/* Append rule_text to end of struct */
 	if (rule_text.bv_val) length += rule_text.bv_len + 1;
-	*mra = ch_malloc( length );
+	*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;