/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* ava.c - routines for dealing with attribute value assertions */
int freeit
)
{
- ad_free( ava->aa_desc, 1 );
- ber_bvfree( ava->aa_value );
+ free( ava->aa_value.bv_val );
if ( freeit ) {
ch_free( (char *) ava );
}
)
{
int rc;
- struct berval type, value, *nvalue;
+ ber_tag_t rtag;
+ struct berval type, value;
AttributeAssertion *aa;
- rc = ber_scanf( ber, "{oo}", &type, &value );
+ rtag = ber_scanf( ber, "{mm}", &type, &value );
- if( rc == LBER_ERROR ) {
+ if( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
- "get_ava: ber_scanf failure\n" ));
+ LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+ "get_ava: ber_scanf failure\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
#endif
aa = ch_malloc( sizeof( AttributeAssertion ) );
aa->aa_desc = NULL;
- aa->aa_value = NULL;
+ aa->aa_value.bv_val = NULL;
rc = slap_bv2ad( &type, &aa->aa_desc, text );
- ch_free( type.bv_val );
if( rc != LDAP_SUCCESS ) {
- ch_free( value.bv_val );
ch_free( aa );
return rc;
}
- rc = value_normalize( aa->aa_desc, usage, &value, &nvalue, text );
- ch_free( value.bv_val );
+ rc = value_validate_normalize( aa->aa_desc, usage,
+ &value, &aa->aa_value, text );
if( rc != LDAP_SUCCESS ) {
- ad_free( aa->aa_desc, 1 );
ch_free( aa );
return rc;
}
- aa->aa_value = nvalue;
*ava = aa;
return LDAP_SUCCESS;
}
-