mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLAP_NVALUES: Use a_nvals

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-02-28 21:05:19 +00:00
parent cd6657fdf0
commit 806c9bfe84
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/filterentry.c
View File

@ -232,7 +232,13 @@ static int test_mra_filter(
a = attrs_find( a->a_next, mra->ma_desc ) )
{
struct berval *bv;
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
#ifdef SLAP_NVALUES
for ( bv = a->a_nvals ? a->a_nvals : a->a_vals;
bv->bv_val != NULL; bv++ )
#else
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ )
#endif
{
int ret;
int rc;
const char *text;
@ -285,7 +291,13 @@ static int test_mra_filter(
}
/* check match */
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
#ifdef SLAP_NVALUES
for ( bv = a->a_nvals ? a->a_nvals : a->a_vals;
bv->bv_val != NULL; bv++ )
#else
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ )
#endif
{
int ret;
int rc;
@ -434,7 +446,13 @@ test_ava_filter(
continue;
}
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
#ifdef SLAP_NVALUES
for ( bv = a->a_nvals ? a->a_nvals : a->a_vals;
bv->bv_val != NULL; bv++ )
#else
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ )
#endif
{
int ret;
int rc;
const char *text;
@ -665,7 +683,13 @@ test_substrings_filter(
continue;
}
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
#ifdef SLAP_NVALUES
for ( bv = a->a_nvals ? a->a_nvals : a->a_vals;
bv->bv_val != NULL; bv++ )
#else
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ )
#endif
{
int ret;
int rc;
const char *text;