upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extend value_match to extract an asserted value from a full value

Browse source 
if needed.  This is controlled by SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
a new flag that should be set when evaluating filters such as in
searches and compares and unset otherwise (such as in modify).

Now, some callers of value_match, notably value_find, don't know
whether to set it or not.  We'll see to that.
This commit is contained in:
Julio Sánchez Fernández 2001-10-22 20:03:30 +00:00
parent 5dbf4bddae
commit 5f6d5494dd
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/value.c
View file

@ -132,6 +132,8 @@ value_match(
{
int rc;
struct berval *nv1 = NULL;
struct berval *nv2 = NULL;
Syntax *syntax;
if( !mr->smr_match ) {
return LDAP_INAPPROPRIATE_MATCHING;
@ -146,13 +148,22 @@ value_match(
}
}
if ( !(flags & SLAP_MR_VALUE_IS_IN_MR_SYNTAX) &&
mr->smr_convert ) {
rc = (mr->smr_convert)(v2,&nv2);
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
}
rc = (mr->smr_match)( match, flags,
ad->ad_type->sat_syntax,
mr,
nv1 != NULL ? nv1 : v1,
v2 );
nv2 != NULL ? nv2 : v2 );
ber_bvfree( nv1 );
ber_bvfree( nv2 );
return rc;
}