Change slapd.conf example directory to $localstatedir/openldap-ldbm

diff --git a/CHANGES b/CHANGES
index dffd629777265912ebcf7f38141dec569563bb21..0939eab18ef3421a9d980bf12e53b57b90515eea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Changes included in OpenLDAP 1.2.11 Release Engineering
                non-zero number of items to process with only one replica.
        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
 
 Changes included in OpenLDAP 1.2.10
        CVS Tag: OPENLDAP_REL_ENG_1_2_10

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 8cfdb7674b80f7bfb41312b98127b340860df6eb..3d42c21cc3d5a5e3095a36a6b772754c22b347f7 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -291,7 +291,7 @@ at the expense of data security.
 .B directory <directory>
 Specify the directory where the LDBM files containing the database and
 associated indexes live.  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 10d392710ce485f281cdf68b3b26c9c98ffa95b1..9ec740127218b730e01ed7be5a29439068db7214 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -118,6 +118,7 @@ CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
 
 install-conf: FORCE
        @-$(MKDIR) $(sysconfdir)
+       @-$(MKDIR) $(localstatedir)/openldap-ldbm
        @for i in $(CFFILES); do \
                tmpcf=/tmp/$$i.$$ ; \
                if test $$i = slapd.conf ; then \

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 6656e9a231810da3f3c83a72fb10036fb3f1db02..c5a7430303bd6e049f380a4b7421fec52ed2409c 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -19,8 +19,9 @@ 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
+# database directory
+directory      %LOCALSTATEDIR%/openldap-ldbm