From e484ebf9c887e4843c94cedc369c0af3293d6490 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 6 Jan 2006 17:28:59 +0000
Subject: [PATCH] complete ACI commit

---
 servers/slapd/aci.c  |  6 ++++++
 servers/slapd/slap.h | 18 ------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/servers/slapd/aci.c b/servers/slapd/aci.c
index 0311558ac7..28b99388ea 100644
--- a/servers/slapd/aci.c
+++ b/servers/slapd/aci.c
@@ -49,6 +49,12 @@
 /* change this to "OpenLDAPset" */
 #define SLAPD_ACI_SET_ATTR		"template"
 
+typedef enum slap_aci_scope_t {
+	SLAP_ACI_SCOPE_ENTRY		= 0x1,
+	SLAP_ACI_SCOPE_CHILDREN		= 0x2,
+	SLAP_ACI_SCOPE_SUBTREE		= ( SLAP_ACI_SCOPE_ENTRY | SLAP_ACI_SCOPE_CHILDREN )
+} slap_aci_scope_t;
+
 enum {
 	ACI_BV_ENTRY,
 	ACI_BV_CHILDREN,
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 2e886985f3..f880a0bd27 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1432,16 +1432,6 @@ typedef struct slap_access {
 
 #ifdef SLAP_DYNACL
 	slap_dynacl_t		*a_dynacl;
-#else /* ! SLAP_DYNACL */
-#ifdef SLAPD_ACI_ENABLED
-	/* NOTE: ACIs have been moved under the "dynacl" interface,
-	 * which is currently built only when LDAP_DEVEL is defined.
-	 *
-	 * In any case, SLAPD_ACI_ENABLED, set by --enable-aci,
-	 * is required to enable ACI support.
-	 */
-	AttributeDescription	*a_aci_at;
-#endif /* SLAPD_ACI_ENABLED */
 #endif /* SLAP_DYNACL */
 
 	/* ACL Groups */
@@ -1498,14 +1488,6 @@ typedef struct slap_acl_state {
 #define ACL_STATE_INIT { ACL_STATE_NOT_RECORDED, NULL, NULL, 0UL, \
 	{ { 0, 0 } }, 0, NULL, 0, 0, NULL }
 
-#ifdef SLAPD_ACI_ENABLED
-typedef enum slap_aci_scope_t {
-	SLAP_ACI_SCOPE_ENTRY		= 0x1,
-	SLAP_ACI_SCOPE_CHILDREN		= 0x2,
-	SLAP_ACI_SCOPE_SUBTREE		= ( SLAP_ACI_SCOPE_ENTRY | SLAP_ACI_SCOPE_CHILDREN )
-} slap_aci_scope_t;
-#endif /* SLAPD_ACI_ENABLED */
-
 /*
  * Backend-info
  * represents a backend 
-- 
2.39.5