Add pidfile/argsfile options to default slapd.conf.

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 5f058307ac1ecfb5cbcb76a475ff31a3f486d769..1c4104df15ebfda0d64c931bb5ba70b552b50f1f 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -122,7 +122,9 @@ install-conf: FORCE
                else \
                        mode=644 ; \
                fi ; \
-               $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \
+               $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
+                       -e 's;%LOCALSTATEDIR%;$(localstatedir);' \
+                       $(srcdir)/$$i > $$tmpcf ; \
                if test ! -f $(sysconfdir)/$$i; then \
                        echo "installing $$i in $(sysconfdir)"; \
                        echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 80e121d3008b505f0351e3db447770197f852353..006b95288fe59f3291a60cd7738cbe36ae552116 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -7,6 +7,9 @@ include         %SYSCONFDIR%/slapd.oc.conf
 schemacheck    off
 referral       ldap://ldap.itd.umich.edu
 
+pidfile                %LOCALSTATEDIR%/slapd.pid
+argsfile       %LOCALSTATEDIR%/slapd.args
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
@@ -20,3 +23,5 @@ rootdn                "cn=root, dc=your-domain, dc=com"
 rootpw         secret
 # cleartext passwords, especially for the rootdn, should
 # be avoid.  See slapd.conf(5) for details.
+
+