[Pkg-openldap-devel] r763 - openldap/trunk-2.3/debian

[Matthijs Mohlmann]

Author: matthijs
Date: 2006-12-12 21:37:10 +0100 (Tue, 12 Dec 2006)
New Revision: 763

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/slapd.init
Log:
 * Add check around piddir.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-12-12 20:27:29 UTC (rev 762)
+++ openldap/trunk-2.3/debian/changelog	2006-12-12 20:37:10 UTC (rev 763)
@@ -1,9 +1,9 @@
 openldap2.3 (2.3.30-2) unstable; urgency=low
 
-  * Reverted change for #390337, it is possible that it chown's complete
-    /var/run. (Closes: #402705)
+  * Make sure that the pidfile directory doesn't exist in the init script.
+    (Closes: #402705)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Tue, 12 Dec 2006 20:54:41 +0100
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Tue, 12 Dec 2006 21:34:44 +0100
 
 openldap2.3 (2.3.30-1) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/slapd.init
===================================================================
--- openldap/trunk-2.3/debian/slapd.init	2006-12-12 20:27:29 UTC (rev 762)
+++ openldap/trunk-2.3/debian/slapd.init	2006-12-12 20:37:10 UTC (rev 763)
@@ -69,6 +69,14 @@
 	exit 1
 fi
 
+# Make sure the pidfile directory exists with correct permissions
+piddir=`dirname "$SLAPD_PIDFILE"`
+if [ ! -d "$piddir" ]; then
+	mkdir -p "$piddir"
+	[ -z "$SLAPD_USER" ] || chown -R "$SLAPD_USER" "$piddir"
+	[ -z "$SLAPD_GROUP" ] || chgrp -R "$SLAPD_GROUP" "$piddir"
+fi
+
 # Pass the user and group to run under to slapd
 if [ "$SLAPD_USER" ]; then
 	SLAPD_OPTIONS="-u $SLAPD_USER $SLAPD_OPTIONS"