From: Howard Chu <hyc@openldap.org>
Date: Mon, 1 May 2006 23:36:38 +0000 (+0000)
Subject: FIx rev 1.207, ACL parsing
X-Git-Tag: OPENLDAP_REL_ENG_2_4_1ALPHA~2^2~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c58f16d9b52fef0874dfd6c9df25d3d7014c8c90;p=openldap

FIx rev 1.207, ACL parsing
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 09e21cdff8..ff9805459b 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1246,14 +1246,15 @@ config_generic(ConfigArgs *c) {
 
 		case CFG_ACL:
 			/* Don't append to the global ACL if we're on a specific DB */
+			i = c->valx;
 			if ( c->be != frontendDB && frontendDB->be_acl && c->valx == -1 ) {
 				AccessControl *a;
-				c->valx = 0;
+				i = 0;
 				for ( a=c->be->be_acl; a && a != frontendDB->be_acl;
 					a = a->acl_next )
-					c->valx++;
+					i++;
 			}
-			if ( parse_acl(c->be, c->fname, c->lineno, c->argc, c->argv, c->valx ) ) {
+			if ( parse_acl(c->be, c->fname, c->lineno, c->argc, c->argv, i ) ) {
 				return 1;
 			}
 			break;