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

value_match cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2004-09-18 06:04:57 +00:00
parent 7f773613f8
commit 2647a615ce
2 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
servers/slapd/filterentry.c
View file

@ -403,7 +403,7 @@ test_ava_filter(
if ( ava->aa_desc == slap_schema.si_ad_entryDN ) { if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
MatchingRule *mr; MatchingRule *mr;
int rc, ret; int rc, match;
const char *text; const char *text;
if( type != LDAP_FILTER_EQUALITY && if( type != LDAP_FILTER_EQUALITY &&
@ -416,11 +416,11 @@ test_ava_filter(
mr = slap_schema.si_ad_entryDN->ad_type->sat_equality; mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
assert( mr ); assert( mr );
rc = value_match( &ret, slap_schema.si_ad_entryDN, mr, 0, rc = value_match( &match, slap_schema.si_ad_entryDN, mr, 0,
&e->e_nname, &ava->aa_value, &text ); &e->e_nname, &ava->aa_value, &text );
if( rc != LDAP_SUCCESS ) return rc; if( rc != LDAP_SUCCESS ) return rc;
if( ret == 0 ) return LDAP_COMPARE_TRUE; if( match == 0 ) return LDAP_COMPARE_TRUE;
return LDAP_COMPARE_FALSE; return LDAP_COMPARE_FALSE;
} }
@ -466,30 +466,29 @@ test_ava_filter(
} }
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) { for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
int ret; int ret, match;
int tmprc;
const char *text; const char *text;
tmprc = value_match( &ret, a->a_desc, mr, 0, ret = value_match( &match, a->a_desc, mr, 0,
bv, &ava->aa_value, &text ); bv, &ava->aa_value, &text );
if( tmprc != LDAP_SUCCESS ) { if( ret != LDAP_SUCCESS ) {
rc = tmprc; rc = ret;
break; break;
} }
switch ( type ) { switch ( type ) {
case LDAP_FILTER_EQUALITY: case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX: case LDAP_FILTER_APPROX:
if ( ret == 0 ) return LDAP_COMPARE_TRUE; if ( match == 0 ) return LDAP_COMPARE_TRUE;
break; break;
case LDAP_FILTER_GE: case LDAP_FILTER_GE:
if ( ret >= 0 ) return LDAP_COMPARE_TRUE; if ( match >= 0 ) return LDAP_COMPARE_TRUE;
break; break;
case LDAP_FILTER_LE: case LDAP_FILTER_LE:
if ( ret <= 0 ) return LDAP_COMPARE_TRUE; if ( match <= 0 ) return LDAP_COMPARE_TRUE;
break; break;
} }
} }
@ -656,18 +655,17 @@ test_substrings_filter(
} }
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) { for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
int ret; int ret, match;
int tmprc;
const char *text; const char *text;
tmprc = value_match( &ret, a->a_desc, mr, 0, ret = value_match( &match, a->a_desc, mr, 0,
bv, f->f_sub, &text ); bv, f->f_sub, &text );
if( tmprc != LDAP_SUCCESS ) { if( ret != LDAP_SUCCESS ) {
rc = tmprc; rc = ret;
break; break;
} }
if ( ret == 0 ) return LDAP_COMPARE_TRUE; if ( match == 0 ) return LDAP_COMPARE_TRUE;
} }
} }

31
servers/slapd/matchedValues.c
View file

@ -172,37 +172,36 @@ test_ava_vrFilter(
bv = a->a_nvals; bv = a->a_nvals;
for ( j=0; bv->bv_val != NULL; bv++, j++ ) { for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
int ret; int rc, match;
int rc;
const char *text; const char *text;
rc = value_match( &ret, a->a_desc, mr, 0, rc = value_match( &match, a->a_desc, mr, 0,
bv, &ava->aa_value, &text ); bv, &ava->aa_value, &text );
if( rc != LDAP_SUCCESS ) return rc; if( rc != LDAP_SUCCESS ) return rc;
switch ( type ) { switch ( type ) {
case LDAP_FILTER_EQUALITY: case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX: case LDAP_FILTER_APPROX:
if ( ret == 0 ) { if ( match == 0 ) {
(*e_flags)[i][j] = 1; (*e_flags)[i][j] = 1;
} }
break; break;
case LDAP_FILTER_GE: case LDAP_FILTER_GE:
if ( ret >= 0 ) { if ( match >= 0 ) {
(*e_flags)[i][j] = 1; (*e_flags)[i][j] = 1;
} }
break; break;
case LDAP_FILTER_LE: case LDAP_FILTER_LE:
if ( ret <= 0 ) { if ( match <= 0 ) {
(*e_flags)[i][j] = 1; (*e_flags)[i][j] = 1;
} }
break; break;
} }
} }
} }
return( LDAP_SUCCESS ); return LDAP_SUCCESS;
} }
static int static int
@ -247,18 +246,15 @@ test_substrings_vrFilter(
bv = a->a_nvals; bv = a->a_nvals;
for ( j = 0; bv->bv_val != NULL; bv++, j++ ) { for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
int ret; int rc, match;
int rc;
const char *text; const char *text;
rc = value_match( &ret, a->a_desc, mr, 0, rc = value_match( &match, a->a_desc, mr, 0,
bv, vrf->vrf_sub, &text ); bv, vrf->vrf_sub, &text );
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) return rc;
return rc;
}
if ( ret == 0 ) { if ( match == 0 ) {
(*e_flags)[i][j] = 1; (*e_flags)[i][j] = 1;
} }
} }
@ -309,15 +305,14 @@ test_mra_vrFilter(
} }
for ( j = 0; bv->bv_val != NULL; bv++, j++ ) { for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
int ret; int rc, match;
int rc;
const char *text; const char *text;
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, rc = value_match( &match, a->a_desc, mra->ma_rule, 0,
bv, &assertedValue, &text ); bv, &assertedValue, &text );
if( rc != LDAP_SUCCESS ) return rc; if( rc != LDAP_SUCCESS ) return rc;
if ( ret == 0 ) { if ( match == 0 ) {
(*e_flags)[i][j] = 1; (*e_flags)[i][j] = 1;
} }
} }