From: Howard Chu <hyc@openldap.org>
Date: Fri, 28 Apr 2006 23:01:59 +0000 (+0000)
Subject: Fix adding ACLs to specific DBs vs global/frontend
X-Git-Tag: OPENLDAP_REL_ENG_2_4_1ALPHA~2^2~112
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d38dd74818fe1adf95bc0067349d1a78ca695c06;p=openldap

Fix adding ACLs to specific DBs vs global/frontend
---

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