/* $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
*/
/* mra.c - routines for dealing with extensible matching rule assertions */
int freeit
)
{
- ch_free( mra->ma_rule_text );
- ber_bvfree( mra->ma_value );
+#if 0 /* no longer a malloc'd string */
+ ch_free( mra->ma_rule_text.bv_val );
+#endif
+ ch_free( mra->ma_value.bv_val );
if ( freeit ) {
ch_free( (char *) mra );
}
{
int rc, tag;
ber_len_t length;
- struct berval type, value, *nvalue;
+ struct berval type, value;
MatchingRuleAssertion *ma;
ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
ma->ma_rule = NULL;
- ma->ma_rule_text = NULL;
+ ma->ma_rule_text.bv_val = NULL;
+ ma->ma_rule_text.bv_len = 0;
ma->ma_desc = NULL;
ma->ma_dnattrs = 0;
- ma->ma_value = NULL;
+ ma->ma_value.bv_val = NULL;
rc = ber_scanf( ber, "{t", &tag );
}
if ( tag == LDAP_FILTER_EXT_OID ) {
- rc = ber_scanf( ber, "a", &ma->ma_rule_text );
+ rc = ber_scanf( ber, "m", &ma->ma_rule_text );
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "get_mra: ber_scanf(\"a\") failure.\n" ));
+ "get_mra: ber_scanf(\"o\") failure.\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for mr\n", 0, 0, 0 );
#endif
mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
- ma->ma_rule = mr_find( ma->ma_rule_text );
+ ma->ma_rule = mr_bvfind( &ma->ma_rule_text );
rc = ber_scanf( ber, "t", &tag );
}
if ( tag == LDAP_FILTER_EXT_TYPE ) {
- rc = ber_scanf( ber, "o", &type );
+ rc = ber_scanf( ber, "m", &type );
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
}
rc = slap_bv2ad( &type, &ma->ma_desc, text );
- ch_free( type.bv_val );
if( rc != LDAP_SUCCESS ) {
- ch_free( value.bv_val );
mra_free( ma, 1 );
return rc;
}
return SLAPD_DISCONNECT;
}
- rc = ber_scanf( ber, "o", &value );
+ rc = ber_scanf( ber, "m", &value );
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
* OK, if no matching rule, normalize for equality, otherwise
* normalize for the matching rule.
*/
- rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &nvalue, text );
- ch_free( value.bv_val );
+ rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &ma->ma_value, text );
if( rc != LDAP_SUCCESS ) {
mra_free( ma, 1 );
return rc;
}
- ma->ma_value = nvalue;
-
tag = ber_peek_tag( ber, &length );
if ( tag == LDAP_FILTER_EXT_DNATTRS ) {