upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix matchedValue (ITS#3209); might need work

Browse source
This commit is contained in:
Pierangelo Masarati 2004-07-03 11:17:11 +00:00
parent b72657acf0
commit a0c28f4d7f
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/matchedValues.c
View file

@ -339,39 +339,44 @@ test_mra_vrFilter(
int i, j;
for ( i=0; a != NULL; a = a->a_next, i++ ) {
struct berval *bv, value;
struct berval *bv, assertedValue;
if ( mra->ma_desc ) {
if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
continue;
}
value = mra->ma_value;
assertedValue = mra->ma_value;
} else {
int rc;
const char *text = NULL;
/* check if matching is appropriate */
if ( strcmp( mra->ma_rule->smr_syntax->ssyn_oid,
a->a_desc->ad_type->sat_syntax->ssyn_oid ) != 0 ) {
if ( !mr_usable_with_at( mra->ma_rule, a->a_desc->ad_type ) ) {
continue;
}
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, op->o_tmpmemctx );
&mra->ma_value, &assertedValue, &text, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) continue;
}
bv = a->a_nvals;
/* check match */
if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
bv = a->a_nvals;
} else {
bv = a->a_vals;
}
for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
int ret;
int rc;
const char *text;
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
bv, &value, &text );
bv, &assertedValue, &text );
if( rc != LDAP_SUCCESS ) {
return rc;
}
@ -384,3 +389,4 @@ test_mra_vrFilter(
return LDAP_SUCCESS;
}