allow array of more generic syntaxes

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 6dc485c1e3d6340f08f0140b256b4ad4ffcfa12f..1115d5884d137bb5d9b666faa9330b7933aa7ca3 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -30,15 +30,15 @@ typedef struct ConfigTable {
        void *notify;
 } ConfigTable;
 
+/* search entries are returned according to this order */
 typedef enum {
        Cft_Abstract = 0,
        Cft_Global,
+       Cft_Module,
        Cft_Schema,
        Cft_Backend,
        Cft_Database,
        Cft_Overlay,
-       Cft_Include,
-       Cft_Module,
        Cft_Misc        /* backend/overlay defined */
 } ConfigType;
 
@@ -136,11 +136,13 @@ typedef struct config_args_s {
 #define SLAP_CONFIG_ADD                0x4000  /* config file add vs LDAP add */
        int op;
        int type;       /* ConfigTable.arg_type & ARGS_USERLAND */
+       Operation *ca_op;
        BackendDB *be;
        BackendInfo *bi;
        Entry *ca_entry;        /* entry being modified */
        void *private;  /* anything */
        ConfigDriver *cleanup;
+       ConfigType table;       /* which config table did we come from */
 } ConfigArgs;
 
 /* If lineno is zero, we have an actual LDAP Add request from a client.