From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 15 Mar 2003 23:02:55 +0000 (+0000)
Subject: Fix test006-acls
X-Git-Tag: NO_SLAP_OP_BLOCKS~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c0477e15324ac488230d83f4a975a2e990b6ecc7;p=openldap

Fix test006-acls
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 9f7be5ef59..02bf54eeae 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1348,7 +1348,14 @@ acl_check_modlist(
 		case LDAP_MOD_ADD:
 			assert( mlist->sml_bvalues != NULL );
 
-			for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ ) {
+#ifdef SLAP_NVALUES
+			for ( bv = mlist->sml_nvalues
+					? mlist->sml_nvalues : mlist->sml_values;
+				bv->bv_val != NULL; bv++ )
+#else
+			for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ )
+#endif
+			{
 				if ( ! access_allowed( be, conn, op, e,
 					mlist->sml_desc, bv, ACL_WRITE, &state ) )
 				{
@@ -1366,7 +1373,14 @@ acl_check_modlist(
 				}
 				break;
 			}
-			for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ ) {
+#ifdef SLAP_NVALUES
+			for ( bv = mlist->sml_nvalues
+					? mlist->sml_nvalues : mlist->sml_values;
+				bv->bv_val != NULL; bv++ )
+#else
+			for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ )
+#endif
+			{
 				if ( ! access_allowed( be, conn, op, e,
 					mlist->sml_desc, bv, ACL_WRITE, &state ) )
 				{