[Pkg-cyrus-sasl2-commits] r147 - in /cyrus-sasl-2.1/trunk/debian: changelog sasl2-bin.saslauthd.default sasl2-bin.saslauthd.init

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Tue Nov 14 10:29:45 2006
New Revision: 147

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=147
Log:
Allow configurable run directory and pid file.

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=147&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Tue Nov 14 10:29:45 2006
@@ -5,8 +5,10 @@
   [ Fabian Fagerholm ]
   * debian/control, debian/rules: Add cyrus-sasl2-dbg package and make
     dh_strip put debugging symbols in it. (Closes: #240767)
-
- -- Fabian Fagerholm <fabbe at debian.org>  Tue, 14 Nov 2006 10:02:56 +0200
+  * debian/sasl2-bin.saslauthd.init: Allow configurable run directory and
+    pid file.
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Tue, 14 Nov 2006 11:26:45 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-2) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default?rev=147&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default Tue Nov 14 10:29:45 2006
@@ -31,6 +31,8 @@
 THREADS=5
 
 # Other options (default: -c)
+# See the saslauthd man page for information about these options.
+#
 # Example for postfix users: "-c -m /var/spool/postfix/var/run/saslauthd"
-# See the saslauthd man page for information about these options.
+# Note: See /usr/share/doc/sasl2-bin/README.Debian
 OPTIONS="-c"

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init?rev=147&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Tue Nov 14 10:29:45 2006
@@ -22,9 +22,8 @@
 NAME=saslauthd
 DAEMON=/usr/sbin/$NAME
 DAEMON_ARGS=""
-RUN_DIR=/var/run/$NAME
-PIDFILE=$RUN_DIR/saslauthd.pid
 SCRIPTNAME=/etc/init.d/$NAME
+FALLBACK_RUN_DIR=/var/run/$NAME
 EXIT_ERROR_CODE=1
 
 # Exit if the daemon is not installed
@@ -39,6 +38,14 @@
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
+
+# Determine run directory and pid file location by looking for an -m option.
+RUN_DIR=`echo "$OPTIONS" | xargs -n 1 echo | sed -n '/^-m$/{n;p}'`
+if [ -z "$RUN_DIR" ]; then
+	# No run directory defined in defaults file, use fallback
+	RUN_DIR=$FALLBACK_RUN_DIR
+fi
+PIDFILE=$RUN_DIR/saslauthd.pid
 
 # If the daemon is not enabled, give the user a warning and then exit,
 # unless we are stopping the daemon