fix ITS#5959 fix

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index a1ca2208ece40a353caa8f07b6963b868899e018..4dc902dac9336f07795f5997169dedd05efd52e9 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-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,45 +17,50 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include<ac/string.h>
+
+LDAP_BEGIN_DECL
+
 typedef struct ConfigTable {
-       char *name;
-       char *what;
+       const char *name;
+       const char *what;
        int min_args;
        int max_args;
        int length;
        unsigned int arg_type;
        void *arg_item;
-       char *attribute;
+       const char *attribute;
        AttributeDescription *ad;
        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_BER_LEN_T  0x00003000
+#define ARG_ON_OFF     0x00004000
+#define ARG_STRING     0x00005000
+#define ARG_BERVAL     0x00006000
+#define ARG_DN         0x00007000
+#define ARG_UINT       0x00008000
+
+#define ARGS_SYNTAX    0xffff0000
 #define ARG_IGNORED    0x00080000
-
-#define ARGS_SYNTAX    0xfff00000
 #define ARG_PRE_BI     0x00100000
 #define ARG_PRE_DB     0x00200000
 #define ARG_DB         0x00400000      /* Only applies to DB */
@@ -94,7 +99,7 @@ typedef int (ConfigCfAdd)(
        Operation *op, SlapReply *rs, Entry *parent, struct config_args_s *ca );
 
 typedef struct ConfigOCs {
-       char *co_def;
+       const char *co_def;
        ConfigType co_type;
        ConfigTable *co_table;
        ConfigLDAPadd *co_ldadd;
@@ -105,6 +110,11 @@ typedef struct ConfigOCs {
 
 typedef int (ConfigDriver)(struct config_args_s *c);
 
+struct config_reply_s {
+       int err;
+       char msg[SLAP_TEXT_BUFLEN];
+};
+
 typedef struct config_args_s {
        int argc;
        char **argv;
@@ -113,13 +123,15 @@ typedef struct config_args_s {
        char *tline;
        const char *fname;
        int lineno;
-       char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
-       char msg[SLAP_TEXT_BUFLEN];
+       char log[MAXPATHLEN + STRLENOF(": line ") + LDAP_PVT_INTTYPE_CHARS(unsigned long)];
+#define cr_msg reply.msg
+       ConfigReply reply;
        int depth;
        int valx;       /* multi-valued value index */
        /* parsed first val for simple cases */
        union {
                int v_int;
+               unsigned v_uint;
                long v_long;
                ber_len_t v_ber_t;
                char *v_string;
@@ -136,11 +148,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 */
+       void *ca_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.
@@ -149,6 +163,7 @@ typedef struct config_args_s {
 #define CONFIG_ONLINE_ADD(ca)  (!((ca)->lineno))
 
 #define value_int values.v_int
+#define value_uint values.v_uint
 #define value_long values.v_long
 #define value_ber_t values.v_ber_t
 #define value_string values.v_string
@@ -156,6 +171,8 @@ typedef struct config_args_s {
 #define value_dn values.v_dn.vdn_dn
 #define value_ndn values.v_dn.vdn_ndn
 
+int config_fp_parse_line(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);
@@ -165,7 +182,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 );
 
@@ -173,8 +190,21 @@ 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 );
 
+int config_shadow( ConfigArgs *c, int flag );
+#define        config_slurp_shadow(c)  config_shadow((c), SLAP_DBFLAG_SLURP_SHADOW)
+#define        config_sync_shadow(c)   config_shadow((c), SLAP_DBFLAG_SYNC_SHADOW)
+
        /* Make sure we don't exceed the bits reserved for userland */
 #define        config_check_userland(last) \
        assert( ( ( (last) - 1 ) & ARGS_USERLAND ) == ( (last) - 1 ) );
 
+#define        SLAP_X_ORDERED_FMT      "{%d}"
+
+extern slap_verbmasks *slap_ldap_response_code;
+extern int slap_ldap_response_code_register( struct berval *bv, int err );
+
+extern ConfigTable olcDatabaseDummy[];
+
+LDAP_END_DECL
+
 #endif /* CONFIG_H */