ITS#6693

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 0c02b00d116b877571e8d157ef125434f47082b4..d16f3c8d8e47f3e754c2fb8bdd5f942ff3712b49 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1542,6 +1542,7 @@ typedef struct AccessControlState {
 
        /* Value dependent acl where processing can restart */
        AccessControl  *as_vd_acl;
+       int as_vd_acl_present;
        int as_vd_acl_count;
        slap_mask_t             as_vd_mask;
 
@@ -1552,7 +1553,7 @@ typedef struct AccessControlState {
        /* True if started to process frontend ACLs */
        int as_fe_done;
 } AccessControlState;
-#define ACL_STATE_INIT { NULL, ACL_NONE, NULL, 0, ACL_PRIV_NONE, -1, 0 }
+#define ACL_STATE_INIT { NULL, ACL_NONE, NULL, 0, 0, ACL_PRIV_NONE, -1, 0 }
 
 typedef struct AclRegexMatches {        
        int dn_count;
@@ -1642,14 +1643,6 @@ typedef struct slap_cf_aux_table {
        void *aux;
 } slap_cf_aux_table;
 
-typedef int 
-slap_cf_aux_table_parse_x LDAP_P((
-       struct berval *val,
-       void *bc,
-       slap_cf_aux_table *tab0,
-       const char *tabmsg,
-       int unparse ));
-
 typedef int 
 slap_cf_aux_table_parse_x LDAP_P((
        struct berval *val,