switch to openldap-data directory

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 8a8417a327067c4ea7ff508094de797836f62f5e..d5584225902139bfc7a61ed29f5b57e16c3af6a5 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -28,16 +28,8 @@ LDAP_BEGIN_DECL
 #define bv2DBT(bv,t)           ((t)->data = (bv)->bv_val, \
                                                                (t)->size = (bv)->bv_len )
 
-#define DEFAULT_MODE           0600
-
 #define BDB_TXN_RETRIES        16
 
-#ifdef BDB_HIER
-#define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-hdb"
-#else
-#define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
-#endif
-
 #ifdef BDB_SUBDIRS
 #define BDB_TMP_SUBDIR LDAP_DIRSEP "tmp"
 #define BDB_LG_SUBDIR  LDAP_DIRSEP "log"

diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index c74d84c40864aa7c791a61e5fb3130182680ca56..16f5ed28a17e0c995d0eabc1f4f8a787499ca312 100644 (file)
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -20,9 +20,6 @@ LDAP_BEGIN_DECL
 #      define DEFAULT_DBCACHE_SIZE 100000
 #endif
 
-#define DEFAULT_DB_DIRECTORY   LDAP_RUNDIR LDAP_DIRSEP "openldap-ldbm"
-#define DEFAULT_MODE           0600
-
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
 #define DN_SUBTREE_PREFIX      '@'