/* filter.c - routines for parsing and dealing with filters */
/* $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
*/
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
- if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) {
+ if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
err = SLAPD_DISCONNECT;
*text = "error decoding filter";
break;
f->f_result = LDAP_COMPARE_FALSE;
ber_str2bv("(unrecognized=*)",
sizeof("(unrecognized=*)")-1, 1, fstr);
- ch_free( type.bv_val );
err = LDAP_SUCCESS;
break;
}
- ch_free( type.bv_val );
-
fstr->bv_len = sizeof("(=*)") - 1
+ f->f_desc->ad_cname.bv_len;
fstr->bv_val = ch_malloc( fstr->bv_len + 1);
break;
}
- free( ftmp.bv_val );
+ if ( ftmp.bv_val ) free( ftmp.bv_val );
if ( err != LDAP_SUCCESS ) {
if ( fstr->bv_val != NULL ) {
#else
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
#endif
- if ( ber_scanf( ber, "{o" /*}*/, &bv ) == LBER_ERROR ) {
+ if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) {
return SLAPD_DISCONNECT;
}
f->f_sub_desc = NULL;
rc = slap_bv2ad( &bv, &f->f_sub_desc, text );
- ch_free( bv.bv_val );
-
if( rc != LDAP_SUCCESS ) {
text = NULL;
ch_free( f->f_sub );
{
unsigned usage;
- rc = ber_scanf( ber, "o", &value );
+ rc = ber_scanf( ber, "m", &value );
if ( rc == LBER_ERROR ) {
rc = SLAPD_DISCONNECT;
goto return_error;
" unknown substring choice=%ld\n",
(long) tag, 0, 0 );
#endif
- free( value.bv_val );
goto return_error;
}
rc = value_normalize( f->f_sub_desc, usage, &value, &bv, text );
- free( value.bv_val );
if( rc != LDAP_SUCCESS ) {
goto return_error;
goto return_error;
}
- bvarray_add( &f->f_sub_any, &value );
+ ber_bvarray_add( &f->f_sub_any, &value );
if( fstr->bv_val ) {
int i = fstr->bv_len;
}
free( f->f_sub_initial.bv_val );
- bvarray_free( f->f_sub_any );
+ ber_bvarray_free( f->f_sub_any );
free( f->f_sub_final.bv_val );
ch_free( f->f_sub );
return rc;
if ( f->f_sub_initial.bv_val != NULL ) {
free( f->f_sub_initial.bv_val );
}
- bvarray_free( f->f_sub_any );
+ ber_bvarray_free( f->f_sub_any );
if ( f->f_sub_final.bv_val != NULL ) {
free( f->f_sub_final.bv_val );
}
}
break;
+ case LDAP_FILTER_EXT:
+ mra_free( f->f_mra, 1 );
+ break;
+
case SLAPD_FILTER_COMPUTED:
break;