for consistency, always represent UUIDs correctly (ITS#5168; really, a de-normalize...

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index e99d00954785e8061c5fbe6ddc17be0cf9307ecc..3664adcb82086866ab10d7bfca0986ddbe6e3bdc 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-2006 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,15 +32,15 @@ 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;
 
@@ -53,6 +55,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
@@ -105,6 +108,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,12 +122,14 @@ 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 */
        union {
                int v_int;
+               unsigned v_uint;
                long v_long;
                ber_len_t v_ber_t;
                char *v_string;
@@ -136,11 +146,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.
@@ -149,6 +161,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