trim use of uninitialized data; please review

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 821dd313c59b506da34036826163e12599ef20e6..3dc25928031df9e67f4e24142fecf50b8fcee7fb 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -35,6 +35,8 @@ typedef enum {
        Cft_Database,
        Cft_Overlay,
        Cft_Include,
+       Cft_Module,
+       Cft_Misc        /* backend/overlay defined */
 } ConfigType;
 
 #define ARGS_USERLAND  0x00000fff
@@ -57,22 +59,49 @@ typedef enum {
 #define ARG_MAY_DB     0x00800000      /* May apply to DB */
 #define ARG_PAREN      0x01000000
 #define ARG_NONZERO    0x02000000
+#define        ARG_NO_INSERT   0x04000000      /* no arbitrary inserting */
+#define        ARG_NO_DELETE   0x08000000      /* no runtime deletes */
 #define ARG_UNIQUE     0x10000000
-#define ARG_MUTEX      0x20000000      /* modify in single-thread mode */
+#define        ARG_QUOTE       0x20000000      /* wrap with quotes before parsing */
 #define ARG_OFFSET     0x40000000
 #define ARG_MAGIC      0x80000000
 
 #define ARG_BAD_CONF   0xdead0000      /* overload return values */
-#define ARG_UNKNOWN    0xc0de0000
 
-extern ConfigTable config_back_cf_table[];
+/* This is a config entry's e_private data */
+typedef struct CfEntryInfo {
+       struct CfEntryInfo *ce_parent;
+       struct CfEntryInfo *ce_sibs;
+       struct CfEntryInfo *ce_kids;
+       Entry *ce_entry;
+       ConfigType ce_type;
+       BackendInfo *ce_bi;
+       BackendDB *ce_be;
+       void *ce_private;
+} CfEntryInfo;
+
+struct config_args_s;
+
+/* Check if the child is allowed to be LDAPAdd'd to the parent */
+typedef int (ConfigLDAPadd)(
+       CfEntryInfo *parent, Entry *child, struct config_args_s *ca);
+
+/* Let the object create children out of slapd.conf */
+typedef int (ConfigCfAdd)(
+       Operation *op, SlapReply *rs, Entry *parent, struct config_args_s *ca );
 
 typedef struct ConfigOCs {
-       char *def;
-       ConfigType cft;
-       ObjectClass **oc;
+       char *co_def;
+       ConfigType co_type;
+       ConfigTable *co_table;
+       ConfigLDAPadd *co_ldadd;
+       ConfigCfAdd *co_cfadd;
+       ObjectClass *co_oc;
+       struct berval *co_name;
 } ConfigOCs;
 
+typedef int (ConfigDriver)(struct config_args_s *c);
+
 typedef struct config_args_s {
        int argc;
        char **argv;
@@ -80,9 +109,11 @@ typedef struct config_args_s {
        char *line;
        char *tline;
        const char *fname;
-       unsigned long lineno;
-       char log[PATH_MAX + STRLENOF(": line 18446744073709551615") + 1];
+       int lineno;
+       char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
+       char msg[SLAP_TEXT_BUFLEN];
        int depth;
+       int valx;       /* multi-valued value index */
        /* parsed first val for simple cases */
        union {
                int v_int;
@@ -99,12 +130,21 @@ 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;
+       Entry *ca_entry;        /* entry being modified */
+       void *private;  /* anything */
+       ConfigDriver *cleanup;
 } ConfigArgs;
 
+/* If lineno is zero, we have an actual LDAP Add request from a client.
+ * Otherwise, we're reading a config file or a config dir.
+ */
+#define CONFIG_ONLINE_ADD(ca)  (!((ca)->lineno))
+
 #define value_int values.v_int
 #define value_long values.v_long
 #define value_ber_t values.v_ber_t
@@ -113,9 +153,19 @@ typedef struct config_args_s {
 #define value_dn values.v_dn.vdn_dn
 #define value_ndn values.v_dn.vdn_ndn
 
-typedef int (ConfigDriver)(ConfigArgs *c);
-
 int config_register_schema(ConfigTable *ct, ConfigOCs *co);
+int config_del_vals(ConfigTable *cf, ConfigArgs *c);
 int config_get_vals(ConfigTable *ct, ConfigArgs *c);
 int config_add_vals(ConfigTable *ct, ConfigArgs *c);
+
+void init_config_argv( ConfigArgs *c );
+int init_config_attrs(ConfigTable *ct);
+int init_config_ocs( ConfigOCs *ocs );
+int config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx);
+int config_parse_add(ConfigTable *ct, ConfigArgs *c);
+int read_config_file(const char *fname, int depth, ConfigArgs *cf,
+       ConfigTable *cft );
+
 ConfigTable * config_find_keyword(ConfigTable *ct, ConfigArgs *c);
+Entry * config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
+       ConfigArgs *c, struct berval *rdn, ConfigOCs *main, ConfigOCs *extra );