fix ITS#3753

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index e56e5c289f0ed34d4c1277ab29daa3394b97c641..bee94817e22d63637206403a34546d2f12013c66 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -35,7 +35,8 @@ typedef enum {
        Cft_Database,
        Cft_Overlay,
        Cft_Include,
-       Cft_Module
+       Cft_Module,
+       Cft_Misc        /* backend/overlay defined */
 } ConfigType;
 
 #define ARGS_USERLAND  0x00000fff
@@ -66,16 +67,38 @@ typedef enum {
 
 #define ARG_BAD_CONF   0xdead0000      /* overload return values */
 
-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;
 
-struct config_args_s;
-
 typedef int (ConfigDriver)(struct config_args_s *c);
 
 typedef struct config_args_s {
@@ -87,6 +110,7 @@ typedef struct config_args_s {
        const char *fname;
        unsigned long 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 */
@@ -110,10 +134,16 @@ typedef struct config_args_s {
        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
@@ -126,3 +156,5 @@ 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);
+Entry * config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
+       ConfigArgs *c, struct berval *rdn, ConfigOCs *main, ConfigOCs *extra );