Style changes, added cvs keywords

[openldap] / include / ldapconfig.h.edit

diff --git a/include/ldapconfig.h.edit b/include/ldapconfig.h.edit
index 2b7e09cde9f88ae2b2f8136047aad38c2af370b7..ae9bea12e62763441ec26363a5e822a4df617103 100644 (file)
--- a/include/ldapconfig.h.edit
+++ b/include/ldapconfig.h.edit
@@ -31,11 +31,13 @@
 /*
  * SHARED DEFINITIONS - things you should change
  */
+#define DEFAULT_DIRSEP         "/"
 #define DEFAULT_BINDIR         "%BINDIR%"
 #define DEFAULT_SBINDIR                "%SBINDIR%"
 #define DEFAULT_DATADIR                "%DATADIR%"
 #define DEFAULT_SYSCONFDIR     "%SYSCONFDIR%"
 #define DEFAULT_LIBEXECDIR     "%LIBEXECDIR%"
+#define DEFAULT_RUNDIR         "%RUNDIR%"
 
 #define DEFAULT_LDAP_CONF_FILE "%SYSCONFDIR%/ldap.conf"
 #define DEFAULT_LDAP_USERRC_FILE "ldaprc"
@@ -213,19 +215,15 @@ Please try again later.\r\n"
 #define SLAPD_DEFAULT_SIZELIMIT                500
        /* default timelimit to spend on a search */
 #define SLAPD_DEFAULT_TIMELIMIT                3600
-       /* location of the slapd pid file */
-#define SLAPD_PIDFILE                  "%RUNDIR%/slapd.pid"
-#define SLAPD_PIDDIR            "%RUNDIR%/"
-#define SLAPD_PIDEXT            ".pid"
-       /* location of the slapd args file */
-#define SLAPD_ARGSFILE                 "%RUNDIR%/slapd.args"
-#define SLAPD_ARGSDIR           "%RUNDIR%/"
-#define SLAPD_ARGSEXT           ".args"
-       /* dn of the special "monitor" entry */
-#define SLAPD_MONITOR_DN               "cn=monitor"
-       /* dn of the special "config" entry */
-#define SLAPD_CONFIG_DN                        "cn=config"
        /* minimum max ids that a single index entry can map to in ldbm */
 #define SLAPD_LDBM_MIN_MAXIDS          4000
 
+/* the following DNs must be normalized and in uppercase! */
+       /* dn of the special "monitor" entry */
+#define SLAPD_MONITOR_DN               "CN=MONITOR"
+       /* dn of the special "config" entry */
+#define SLAPD_CONFIG_DN                        "CN=CONFIG"
+       /* dn of the special "schema" entry */
+/* #define SLAPD_SCHEMA_DN                     "CN=SCHEMA" */
+
 #endif /* _LDAP_CONFIG_H */