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
)
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 = value_validate_normalize( aa->aa_desc, usage,
- &value, &aa->aa_value, text );
+ rc = asserted_value_validate_normalize(
+ aa->aa_desc, ad_mr(aa->aa_desc, usage),
+ 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;
}