Fix prev commit, trim unused cfOC vars

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index b5c3e9fe2180382d1c2faee4c96b594f158db385..47badfe7a392d86408b7e831361c34f59edc53ff 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -14,13 +14,6 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#ifndef PATH_MAX
-#define        PATH_MAX        4096
-#endif
-
 typedef struct ConfigTable {
        char *name;
        char *what;
@@ -42,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
@@ -65,28 +59,48 @@ 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_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;
-#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
+       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;
@@ -95,8 +109,10 @@ typedef struct config_args_s {
        char *tline;
        const char *fname;
        unsigned long lineno;
-       char log[PATH_MAX + STRLENOF(": line 18446744073709551615") + 1];
+       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;
@@ -118,7 +134,9 @@ 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;
 
 #define value_int values.v_int
@@ -129,9 +147,9 @@ 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_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 );