complete ACI commit

diff --git a/servers/slapd/aci.c b/servers/slapd/aci.c
index 0311558ac736b53ddfcb9f79dec588d3ca3dc590..28b99388ea2381f791e423411a116c095f774b8f 100644 (file)
--- 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 2e886985f33d9f42683cdded8c77081f31664ea5..f880a0bd27d672b32ce0efe91307062a87a4a506 100644 (file)
--- 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