fix ITS#5959 fix

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 3664adcb82086866ab10d7bfca0986ddbe6e3bdc..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-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,15 +19,17 @@
 
 #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;
@@ -97,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;
@@ -108,10 +110,10 @@ typedef struct ConfigOCs {
 
 typedef int (ConfigDriver)(struct config_args_s *c);
 
-typedef struct config_reply_s {
+struct config_reply_s {
        int err;
        char msg[SLAP_TEXT_BUFLEN];
-} ConfigReply;
+};
 
 typedef struct config_args_s {
        int argc;
@@ -121,7 +123,7 @@ typedef struct config_args_s {
        char *tline;
        const char *fname;
        int lineno;
-       char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
+       char log[MAXPATHLEN + STRLENOF(": line ") + LDAP_PVT_INTTYPE_CHARS(unsigned long)];
 #define cr_msg reply.msg
        ConfigReply reply;
        int depth;
@@ -150,7 +152,7 @@ typedef struct config_args_s {
        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;
@@ -169,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);
@@ -196,4 +200,11 @@ int config_shadow( ConfigArgs *c, int flag );
 
 #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 */