SLAP_NVALUES fix matchedValues

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 4f0dafbdb6f22a3b977da373a4d084e71b791f35..fa3f8597bd87a88a89c23d39f8d99190dd25f27b 100644 (file)
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -235,7 +235,12 @@ test_ava_vrFilter(
 
                }
 
-               for ( bv = a->a_vals, j=0; bv->bv_val != NULL; bv++, j++ ) {
+#ifdef SLAP_NVALUES
+               bv = a->a_nvals;
+#else
+               bv = a->a_vals;
+#endif
+               for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
                        int ret;
                        int rc;
                        const char *text;
@@ -321,7 +326,12 @@ test_substrings_vrFilter(
                        continue;
                }
 
-               for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
+#ifdef SLAP_NVALUES
+               bv = a->a_nvals;
+#else
+               bv = a->a_vals;
+#endif
+               for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
                        int ret;
                        int rc;
                        const char *text;