int
get_ava(
BerElement *ber,
- AttributeAssertion **ava
+ AttributeAssertion **ava,
+ unsigned usage,
+ const char **text
)
{
int rc;
- char *text;
- struct berval type, *value;
+ struct berval type, value, *nvalue;
AttributeAssertion *aa;
- rc = ber_scanf( ber, "{oO}", &type, &value );
+ rc = ber_scanf( ber, "{oo}", &type, &value );
if( rc == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
+ *text = "Error decoding attribute value assertion";
return SLAPD_DISCONNECT;
}
aa = ch_malloc( sizeof( AttributeAssertion ) );
+ aa->aa_desc = NULL;
+ aa->aa_value = NULL;
- rc = slap_bv2ad( &type, &aa->aa_desc, &text );
+ rc = slap_bv2ad( &type, &aa->aa_desc, text );
if( rc != LDAP_SUCCESS ) {
ch_free( type.bv_val );
- ber_bvfree( value );
+ ch_free( value.bv_val );
ch_free( aa );
return rc;
}
- aa->aa_value = value;
+ rc = value_normalize( aa->aa_desc, usage, &value, &nvalue, text );
+ ch_free( value.bv_val );
+
+ if( rc != LDAP_SUCCESS ) {
+ ch_free( type.bv_val );
+ ad_free( aa->aa_desc, 1 );
+ ch_free( aa );
+ return rc;
+ }
+
+ aa->aa_value = nvalue;
+ *ava = aa;
return LDAP_SUCCESS;
}
int
get_ava(
BerElement *ber,
- Ava *ava
+ Ava *ava,
+ const char **text
)
{
if ( ber_scanf( ber, "{ao}", &ava->ava_type, &ava->ava_value )
== LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
+ *text = "Error decoding attribute value assertion";
return SLAPD_DISCONNECT;
}