Move default LDBM directory from /usr/tmp to $(localstatedir)

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 79e7489ef822269ed1bb9dd18d1bf7e9088b8760..3d37fee12fdc1ed91fe99624709840fdf5c2c945 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -401,7 +401,7 @@ performance at the expense of data security.
 Specify the directory where the LDBM files containing this database and
 associated indexes live.  A separate directory must be specified for
 each database.  The default is
-.B /usr/tmp.
+.BR LOCALSTATEDIR/openldap-ldbm .
 .TP
 .B
 index { <attrlist> | default } [ pres,eq,approx,sub,none ]

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 76bf90ee4e0a6cd0201599e96adce53ee36bffba..5d15867d0bffa11869c9d21d47ddb11a563c8fcb 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -201,6 +201,7 @@ install-schema: FORCE
 
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
+       @-$(MKDIR) $(DESTDIR)$(localstatedir)/openldap-ldbm
        @for i in $(CFFILES); do \
                tmpcf=$$i.tmp ; \
                if test $$i = slapd.conf ; then \

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index a36dccabf23c3688c53527002e70c522227869ec..ea9b076b410f383a2964af19d2563b65e50f9c55 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -36,8 +36,7 @@ suffix                "dc=my-domain, dc=com"
 #suffix                "o=My Organization Name, c=US"
 rootdn         "cn=Manager, dc=my-domain, dc=com"
 #rootdn                "cn=Manager, o=My Organization Name, c=US"
-rootpw         secret
 # cleartext passwords, especially for the rootdn, should
 # be avoid.  See slapd.conf(5) for details.
-directory      /usr/tmp
-
+rootpw         secret
+directory      %LOCALSTATEDIR%/openldap-ldbm