int freeit
)
{
+#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 );
}
if ( tag == LDAP_FILTER_EXT_OID ) {
- rc = ber_scanf( ber, "o", &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,
}
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 ) {
mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
- rc = ber_scanf( ber, "o", &value );
+ rc = ber_scanf( ber, "m", &value );
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
* normalize for the matching rule.
*/
rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &ma->ma_value, text );
- ch_free( value.bv_val );
if( rc != LDAP_SUCCESS ) {
mra_free( ma, 1 );