From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 28 Feb 2003 21:05:19 +0000 (+0000)
Subject: SLAP_NVALUES: Use a_nvals
X-Git-Tag: NO_SLAP_OP_BLOCKS~241
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=806c9bfe84d2624376c90ccdd9a6d7518c215b97;p=openldap

SLAP_NVALUES: Use a_nvals
---

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index f137556461..b523c756fd 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -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;