misc cleanup

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 9cfde4b98d3e04b8f94fe9c756543b47506f3c51..0ec27edcc51db98e816badf8b4304f9015195e3d 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -17,20 +17,22 @@
 
 void
 ava_free(
-    AttributeAssertion *ava,
-    int        freeit
+       Operation *op,
+       AttributeAssertion *ava,
+       int     freeit
 )
 {
-       free( ava->aa_value.bv_val );
+       op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
        if ( freeit ) {
-               ch_free( (char *) ava );
+               op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
        }
 }
 
 int
 get_ava(
-    BerElement *ber,
-    AttributeAssertion **ava,
+       Operation *op,
+       BerElement      *ber,
+       AttributeAssertion      **ava,
        unsigned usage,
        const char **text
 )
@@ -52,23 +54,23 @@ get_ava(
                return SLAPD_DISCONNECT;
        }
 
-       aa = ch_malloc( sizeof( AttributeAssertion ) );
+       aa = op->o_tmpalloc( sizeof( AttributeAssertion ), op->o_tmpmemctx );
        aa->aa_desc = NULL;
        aa->aa_value.bv_val = NULL;
 
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( aa );
+               op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }
 
        rc = asserted_value_validate_normalize(
                aa->aa_desc, ad_mr(aa->aa_desc, usage),
-               usage, &value, &aa->aa_value, text );
+               usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( aa );
+               op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }