fix previous commit

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index b9b9466f1b594b8fdc2bf8704fc5f64a1bebd67f..be90c5c2d32267119a3776328388ebfab63af7a9 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -27,6 +27,17 @@ typedef struct ConfigTable {
        void *notify;
 } ConfigTable;
 
+typedef enum {
+       Cft_Abstract = 0,
+       Cft_Global,
+       Cft_Schema,
+       Cft_Backend,
+       Cft_Database,
+       Cft_Overlay,
+       Cft_Include,
+       Cft_Module
+} ConfigType;
+
 #define ARGS_USERLAND  0x00000fff
 #define ARGS_TYPES     0x000ff000
 #define ARGS_POINTER   0x0003f000
@@ -59,7 +70,14 @@ extern ConfigTable config_back_cf_table[];
 
 typedef struct ConfigOCs {
        char *def;
+       ConfigType cft;
        ObjectClass **oc;
+#if 0
+       BI_op_add *add;         /* optional, add-specific processing */
+       BI_op_delete *del;      /* mandatory, delete implementation */
+       BI_op_modify *mod;      /* optional, mod-specific */
+       BI_op_modrdn *ren;      /* optional, modrdn... */
+#endif
 } ConfigOCs;
 
 typedef struct config_args_s {
@@ -67,6 +85,7 @@ typedef struct config_args_s {
        char **argv;
        int argv_size;
        char *line;
+       char *tline;
        const char *fname;
        unsigned long lineno;
        char log[PATH_MAX + STRLENOF(": line 18446744073709551615") + 1];
@@ -87,10 +106,12 @@ typedef struct config_args_s {
        BerVarray rvalue_vals;
        BerVarray rvalue_nvals;
 #define        SLAP_CONFIG_EMIT        0x2000  /* emit instead of set */
+#define SLAP_CONFIG_ADD                0x4000  /* config file add vs LDAP add */
        int op;
        int type;       /* ConfigTable.arg_type & ARGS_USERLAND */
        BackendDB *be;
        BackendInfo *bi;
+       void *private;  /* anything */
 } ConfigArgs;
 
 #define value_int values.v_int
@@ -103,6 +124,7 @@ typedef struct config_args_s {
 
 typedef int (ConfigDriver)(ConfigArgs *c);
 
+int config_register_schema(ConfigTable *ct, ConfigOCs *co);
 int config_get_vals(ConfigTable *ct, ConfigArgs *c);
 int config_add_vals(ConfigTable *ct, ConfigArgs *c);
 ConfigTable * config_find_keyword(ConfigTable *ct, ConfigArgs *c);