Change compiled in LDBM default directory

diff --git a/CHANGES b/CHANGES
index 0939eab18ef3421a9d980bf12e53b57b90515eea..28965ed91b6dde3a745d9e0a232db66f7859d844 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@ Changes included in OpenLDAP 1.2.11 Release Engineering
        Fix strdup use in libldap/request.c
        Fix NULL prefix bug in libldap/ufn.c
        Build Environment
-               Change slapd.conf LDBM directory to $localstatedir/openldap-ldbm
+               Change LDBM directory to $localstatedir/openldap-ldbm
 
 Changes included in OpenLDAP 1.2.10
        CVS Tag: OPENLDAP_REL_ENG_1_2_10

diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index e0816acd48ef2b6422a0028a5092522385476af2..f83e3ec75dedcf5169c184156ac096238496910b 100644 (file)
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -4,6 +4,7 @@
 #define _BACK_LDBM_H_
 
 #include "ldbm.h"
+#include "ldapconfig.h"
 
 LDAP_BEGIN_DECL
 
@@ -15,7 +16,7 @@ LDAP_BEGIN_DECL
 #      define DEFAULT_DBCACHE_SIZE 100000
 #endif
 
-#define DEFAULT_DB_DIRECTORY   "/usr/tmp"
+#define DEFAULT_DB_DIRECTORY   DEFAULT_RUNDIR DEFAULT_DIRSEP "openldap-ldbm"
 #define DEFAULT_MODE           0600
 
 #define SUBLEN                 3