X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.h;h=4dc902dac9336f07795f5997169dedd05efd52e9;hb=eb3e92481bfbc655164e5c66aa3499a4315ac6ea;hp=5e51edc26e3f45d40345a3ce8a218922894902ac;hpb=10942dceeabbe0958e9c49e61899bb4ff9a21e96;p=openldap
diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 5e51edc26e..4dc902dac9 100644
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * 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
@@ -17,15 +17,19 @@
#ifndef CONFIG_H
#define CONFIG_H
+#include
+
+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;
@@ -34,7 +38,6 @@ typedef struct ConfigTable {
typedef enum {
Cft_Abstract = 0,
Cft_Global,
- Cft_Include,
Cft_Module,
Cft_Schema,
Cft_Backend,
@@ -54,6 +57,7 @@ typedef enum {
#define ARG_STRING 0x00005000
#define ARG_BERVAL 0x00006000
#define ARG_DN 0x00007000
+#define ARG_UINT 0x00008000
#define ARGS_SYNTAX 0xffff0000
#define ARG_IGNORED 0x00080000
@@ -95,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;
@@ -106,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;
@@ -114,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;
@@ -141,8 +152,9 @@ 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;
/* If lineno is zero, we have an actual LDAP Add request from a client.
@@ -151,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
@@ -158,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);
@@ -185,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 */