[Pkg-openldap-devel] [openldap] 01/02: Ensure /var/run/slapd exists when starting slapd

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 490a7d77f2e2df8b5450dddf5405886ff0a67f65
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Mar 20 19:45:50 2016 -0700

    Ensure /var/run/slapd exists when starting slapd
---
 debian/changelog  | 2 ++
 debian/slapd.init | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cb244a6..c7afc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
   * Fix a typo (slpad -> slapd) in the Catalan debconf translation.
   * Disable OpenSLP support and remove libslp-dev from Build-Depends.
     (Closes: #815364)
+  * Ensure /var/run/slapd exists when starting slapd, even if the pid file is 
+    somewhere else. Thanks to Dave Beach for the report.
 
  -- Ryan Tandy <ryan at nardis.ca>  Tue, 15 Mar 2016 03:45:08 +0000
 
diff --git a/debian/slapd.init b/debian/slapd.init
index c4ef264..a36cdc3 100644
--- a/debian/slapd.init
+++ b/debian/slapd.init
@@ -132,6 +132,13 @@ report_failure() {
 # Start the slapd daemon and capture the error message if any to 
 # $reason.
 start_slapd() {
+	# Make sure /var/run/slapd exists with correct permissions
+	if [ ! -d /var/run/slapd ]; then
+		mkdir -p /var/run/slapd
+		[ -z "$SLAPD_USER" ] || chown -R "$SLAPD_USER" /var/run/slapd
+		[ -z "$SLAPD_GROUP" ] || chgrp -R "$SLAPD_GROUP" /var/run/slapd
+	fi
+
 	if [ -z "$SLAPD_SERVICES" ]; then
 		reason="`start-stop-daemon --start --quiet --oknodo \
 			--pidfile "$SLAPD_PIDFILE" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git