#include "slap.h"
-#include "../../libraries/liblber/lber-int.h"
-
static int
test_mra_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
MatchingRuleAssertion *mra,
static int
test_substrings_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
ValuesReturnFilter *f,
static int
test_presence_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
AttributeDescription *desc,
static int
test_ava_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
AttributeAssertion *ava,
int
filter_matched_values(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
char ***e_flags
#else
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
#endif
- rc = test_ava_vrFilter( be, conn, op, a, vrf->vrf_ava,
+ rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_EQUALITY, e_flags );
if( rc == -1 ) {
return rc;
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
#endif
- rc = test_substrings_vrFilter( be, conn, op, a,
+ rc = test_substrings_vrFilter( op, a,
vrf, e_flags );
if( rc == -1 ) {
return rc;
#else
Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
#endif
- rc = test_presence_vrFilter( be, conn, op, a,
+ rc = test_presence_vrFilter( op, a,
vrf->vrf_desc, e_flags );
if( rc == -1 ) {
return rc;
break;
case LDAP_FILTER_GE:
- rc = test_ava_vrFilter( be, conn, op, a, vrf->vrf_ava,
+ rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_GE, e_flags );
if( rc == -1 ) {
return rc;
break;
case LDAP_FILTER_LE:
- rc = test_ava_vrFilter( be, conn, op, a, vrf->vrf_ava,
+ rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_LE, e_flags );
if( rc == -1 ) {
return rc;
#else
Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
#endif
- rc = test_mra_vrFilter( be, conn, op, a,
+ rc = test_mra_vrFilter( op, a,
vrf->vrf_mra, e_flags );
if( rc == -1 ) {
return rc;
static int
test_ava_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
AttributeAssertion *ava,
}
- for ( bv = a->a_vals, j=0; bv->bv_val != NULL; bv++, j++ ) {
+ bv = a->a_nvals;
+ for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
int ret;
int rc;
const char *text;
static int
test_presence_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
AttributeDescription *desc,
static int
test_substrings_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
ValuesReturnFilter *vrf,
continue;
}
- for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
+ bv = a->a_nvals;
+ for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
int ret;
int rc;
const char *text;
static int
test_mra_vrFilter(
- Backend *be,
- Connection *conn,
Operation *op,
Attribute *a,
MatchingRuleAssertion *mra,
continue;
}
-#ifdef SLAP_NVALUES
rc = asserted_value_validate_normalize( a->a_desc, mra->ma_rule,
SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
- &mra->ma_value, &value, &text );
-#else
- /* normalize for equality */
- rc = value_validate_normalize( a->a_desc,
- SLAP_MR_EQUALITY,
- &mra->ma_value, &value,
- &text );
-#endif
+ &mra->ma_value, &value, &text, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) continue;
}
-#ifdef SLAP_NVALUES
bv = a->a_nvals;
-#else
- bv = a->a_vals;
-#endif
for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
int ret;
int rc;