Hide log schema

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index b5085e2a15c4be974fcb2a0a040f8d0537560890..be5e2925a8ddce6b9fafd463f817004f124d6865 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,6 +17,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include<ac/string.h>
+
 typedef struct ConfigTable {
        char *name;
        char *what;
@@ -30,32 +32,32 @@ 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;
 
 #define ARGS_USERLAND  0x00000fff
-#define ARGS_TYPES     0x000ff000
-#define ARGS_POINTER   0x0003f000
-#define ARGS_NUMERIC   0x0000f000
+
+/* types are enumerated, not a bitmask */
+#define ARGS_TYPES     0x0000f000
 #define ARG_INT                0x00001000
 #define ARG_LONG       0x00002000
-#define ARG_BER_LEN_T  0x00004000
-#define ARG_ON_OFF     0x00008000
-#define ARG_STRING     0x00010000
-#define ARG_BERVAL     0x00020000
-#define ARG_DN         0x00040000
-#define ARG_IGNORED    0x00080000
+#define ARG_BER_LEN_T  0x00003000
+#define ARG_ON_OFF     0x00004000
+#define ARG_STRING     0x00005000
+#define ARG_BERVAL     0x00006000
+#define ARG_DN         0x00007000
 
-#define ARGS_SYNTAX    0xfff00000
+#define ARGS_SYNTAX    0xffff0000
+#define ARG_IGNORED    0x00080000
 #define ARG_PRE_BI     0x00100000
 #define ARG_PRE_DB     0x00200000
 #define ARG_DB         0x00400000      /* Only applies to DB */
@@ -105,6 +107,11 @@ typedef struct ConfigOCs {
 
 typedef int (ConfigDriver)(struct config_args_s *c);
 
+typedef struct config_reply_s {
+       int err;
+       char msg[SLAP_TEXT_BUFLEN];
+} ConfigReply;
+
 typedef struct config_args_s {
        int argc;
        char **argv;
@@ -114,7 +121,8 @@ typedef struct config_args_s {
        const char *fname;
        int lineno;
        char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
-       char msg[SLAP_TEXT_BUFLEN];
+#define cr_msg reply.msg
+       ConfigReply reply;
        int depth;
        int valx;       /* multi-valued value index */
        /* parsed first val for simple cases */
@@ -136,11 +144,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.
@@ -165,7 +175,7 @@ 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 config_parse_add(ConfigTable *ct, ConfigArgs *c, int valx);
 int read_config_file(const char *fname, int depth, ConfigArgs *cf,
        ConfigTable *cft );
 
@@ -181,4 +191,6 @@ int config_shadow( ConfigArgs *c, int flag );
 #define        config_check_userland(last) \
        assert( ( ( (last) - 1 ) & ARGS_USERLAND ) == ( (last) - 1 ) );
 
+#define        SLAP_X_ORDERED_FMT      "{%d}"
+
 #endif /* CONFIG_H */