upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SLAP_NVALUES - a_nvals is useless if ma_rule isn't the same as attr's.

Browse source
This commit is contained in:
Howard Chu 2003-03-24 02:16:42 +00:00
parent d50064ddb8
commit 0e1378e55e
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
servers/slapd/filterentry.c
View file

@ -233,10 +233,14 @@ static int test_mra_filter(
{
struct berval *bv;
#ifdef SLAP_NVALUES
bv = a->a_nvals;
#else
bv = a->a_vals;
/* If ma_rule is not the same as the attribute's
* normal rule, then we can't use the a_nvals.
*/
if (mra->ma_rule == a->a_desc->ad_type->sat_equality)
bv = a->a_nvals;
else
#endif
bv = a->a_vals;
for ( ; bv->bv_val != NULL; bv++ )
{
int ret;
@ -292,10 +296,12 @@ static int test_mra_filter(
/* check match */
#ifdef SLAP_NVALUES
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ )
#else
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ )
if (mra->ma_rule == a->a_desc->ad_type->sat_equality)
bv = a->a_nvals;
else
#endif
bv = a->a_vals;
for ( ; bv->bv_val != NULL; bv++ )
{
int ret;
int rc;