[Pkg-openldap-devel] r1312 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 593880 pending
thanks

Author: vorlon
Date: 2010-09-06 18:59:21 +0000 (Mon, 06 Sep 2010)
New Revision: 1312

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.init
Log:
debian/slapd.init: correctly set the slapd.conf argument even when
SLAPD_PIDFILE is non-empty in /etc/default/slapd.  Thanks to Peter
Marschall <peter at adpm.de> for the patch.  Closes: #593880.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-05 23:09:57 UTC (rev 1311)
+++ openldap/trunk/debian/changelog	2010-09-06 18:59:21 UTC (rev 1312)
@@ -4,6 +4,9 @@
   * debian/slapd.scripts-common: fix gratuitous (and wrong) use of grep in
     get_suffix(), which causes us to incorrectly parse any slapd.conf that
     uses tabs instead of spaces.  Closes; #595672.
+  * debian/slapd.init: correctly set the slapd.conf argument even when
+    SLAPD_PIDFILE is non-empty in /etc/default/slapd.  Thanks to Peter
+    Marschall <peter at adpm.de> for the patch.  Closes: #593880.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 05 Sep 2010 16:08:53 -0700
 

Modified: openldap/trunk/debian/slapd.init
===================================================================
--- openldap/trunk/debian/slapd.init	2010-09-05 23:09:57 UTC (rev 1311)
+++ openldap/trunk/debian/slapd.init	2010-09-06 18:59:21 UTC (rev 1312)
@@ -44,19 +44,24 @@
   exit 1
 fi
 
+# extend options depending on config type
+if [ -f "$SLAPD_CONF" ]; then
+	SLAPD_OPTIONS="-f $SLAPD_CONF $SLAPD_OPTIONS"
+elif [ -d "$SLAPD_CONF" ] ; then
+	SLAPD_OPTIONS="-F $SLAPD_CONF $SLAPD_OPTIONS"
+fi
+
 # Find out the name of slapd's pid file
 if [ -z "$SLAPD_PIDFILE" ]; then
 	# If using old one-file configuration scheme
 	if [ -f "$SLAPD_CONF" ] ; then
 		SLAPD_PIDFILE=`sed -ne 's/^pidfile[[:space:]]\+\(.\+\)/\1/p' \
 			"$SLAPD_CONF"`
-		SLAPD_OPTIONS="-f $SLAPD_CONF $SLAPD_OPTIONS"
 	# Else, if using new directory configuration scheme
 	elif [ -d "$SLAPD_CONF" ] ; then
 		SLAPD_PIDFILE=`sed -ne \
 			's/^olcPidFile:[[:space:]]\+\(.\+\)[[:space:]]*/\1/p' \
 			"$SLAPD_CONF"/'cn=config.ldif'`
-		SLAPD_OPTIONS="-F $SLAPD_CONF $SLAPD_OPTIONS"
 	fi
 fi