static int test_filter_or( Backend *be,
Connection *conn, Operation *op,
Entry *e, Filter *flist );
-static int test_substring_filter( Backend *be,
+static int test_substrings_filter( Backend *be,
Connection *conn, Operation *op,
Entry *e, Filter *f);
static int test_ava_filter( Backend *be,
case LDAP_FILTER_SUBSTRINGS:
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
- rc = test_substring_filter( be, conn, op, e, f );
+ rc = test_substrings_filter( be, conn, op, e, f );
break;
case LDAP_FILTER_GE:
#ifdef SLAPD_EXT_FILTERS
case LDAP_FILTER_EXT:
Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
-#if SLAPD_SCHEMA_NOT_COMPAT
rc = test_mra_filter( be, conn, op, e, f->f_mra );
-#else
- rc = LDAP_UNWILLING_TO_PERFORM;
-#endif
break;
#endif
mr = a->a_desc->ad_type->sat_approx;
if( mr != NULL ) break;
+ /* use EQUALITY matching rule if no APPROX rule */
+
case LDAP_FILTER_EQUALITY:
mr = a->a_desc->ad_type->sat_equality;
break;
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr,
+ rc = value_match( &ret, a->a_desc, mr, 0,
a->a_vals[i], ava->aa_value,
&text );
static int
-test_substring_filter(
+test_substrings_filter(
Backend *be,
Connection *conn,
Operation *op,
{
Attribute *a;
- Debug( LDAP_DEBUG_FILTER, "begin test_substring_filter\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
if ( be != NULL && ! access_allowed( be, conn, op, e,
f->f_sub_desc, NULL, ACL_SEARCH ) )
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr,
+ rc = value_match( &ret, a->a_desc, mr, 0,
a->a_vals[i], f->f_sub,
&text );
}
}
- Debug( LDAP_DEBUG_FILTER, "end test_substring_filter 1\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
return LDAP_COMPARE_FALSE;
}