X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.h;h=d79ae7406c1b41bd43191fd9ff4afc9a45c9f960;hb=ef7f5f5e32e6e0f129aee7fa1626017a7dadcb48;hp=ea12fcd4388832cf1423633b039d1a79673f7359;hpb=5ae46c195ed5dd2b5117d2301645e8b7a00d9a0a;p=openldap
diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index ea12fcd438..d79ae7406c 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-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -19,15 +19,17 @@
#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;
@@ -55,6 +57,9 @@ typedef enum {
#define ARG_STRING 0x00005000
#define ARG_BERVAL 0x00006000
#define ARG_DN 0x00007000
+#define ARG_UINT 0x00008000
+#define ARG_ATDESC 0x00009000
+#define ARG_ULONG 0x0000a000
#define ARGS_SYNTAX 0xffff0000
#define ARG_IGNORED 0x00080000
@@ -95,18 +100,32 @@ typedef int (ConfigLDAPadd)(
typedef int (ConfigCfAdd)(
Operation *op, SlapReply *rs, Entry *parent, struct config_args_s *ca );
+#ifdef SLAP_CONFIG_DELETE
+/* Called when deleting a Cft_Misc Child object from cn=config */
+typedef int (ConfigLDAPdel)(
+ CfEntryInfo *ce, Operation *op );
+#endif
+
typedef struct ConfigOCs {
- char *co_def;
+ const char *co_def;
ConfigType co_type;
ConfigTable *co_table;
ConfigLDAPadd *co_ldadd;
ConfigCfAdd *co_cfadd;
+#ifdef SLAP_CONFIG_DELETE
+ ConfigLDAPdel *co_lddel;
+#endif
ObjectClass *co_oc;
struct berval *co_name;
} 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;
@@ -115,14 +134,17 @@ 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;
+ unsigned long v_ulong;
ber_len_t v_ber_t;
char *v_string;
struct berval v_bv;
@@ -130,6 +152,7 @@ typedef struct config_args_s {
struct berval vdn_dn;
struct berval vdn_ndn;
} v_dn;
+ AttributeDescription *v_ad;
} values;
/* return values for emit mode */
BerVarray rvalue_vals;
@@ -142,7 +165,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;
@@ -153,12 +176,17 @@ 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_ulong values.v_ulong
#define value_ber_t values.v_ber_t
#define value_string values.v_string
#define value_bv values.v_bv
#define value_dn values.v_dn.vdn_dn
#define value_ndn values.v_dn.vdn_ndn
+#define value_ad values.v_ad
+
+int config_fp_parse_line(ConfigArgs *c);
int config_register_schema(ConfigTable *ct, ConfigOCs *co);
int config_del_vals(ConfigTable *cf, ConfigArgs *c);
@@ -177,7 +205,8 @@ 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 );
+Listener *config_check_my_url(const char *url, LDAPURLDesc *lud);
+int config_shadow( ConfigArgs *c, slap_mask_t 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)
@@ -187,4 +216,11 @@ int config_shadow( ConfigArgs *c, int flag );
#define SLAP_X_ORDERED_FMT "{%d}"
+LDAP_SLAPD_V (slap_verbmasks *) slap_ldap_response_code;
+extern int slap_ldap_response_code_register( struct berval *bv, int err );
+
+LDAP_SLAPD_V (ConfigTable) olcDatabaseDummy[];
+
+LDAP_END_DECL
+
#endif /* CONFIG_H */