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

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Mar 13 01:41:48 2011
New Revision: 618

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=618
Log:
debian/sasl2-bin.saslauthd.init: Properly handle $(OPTIONS) missing from
defaults file (Closes: #515534)

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    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=618&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sun Mar 13 01:41:48 2011
@@ -3,8 +3,10 @@
   * Eliminate getsubopt conflict when building with glibc 2.2, thanks to
     Colin Watson for the patch (Closes: #588528)
   * Convert package from using dpatch to using quilt
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 12 Mar 2011 15:04:33 -0500
+  * debian/sasl2-bin.saslauthd.init: Properly handle $(OPTIONS) missing from
+    defaults file (Closes: #515534)
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 12 Mar 2011 20:40:50 -0500
 
 cyrus-sasl2 (2.1.23.dfsg1-7) unstable; urgency=low
 

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=618&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Sun Mar 13 01:41:48 2011
@@ -90,12 +90,18 @@
 
 	log_daemon_msg "Starting $DESC" "$NAME"
 
+	# Set OPTIONS to a default value, as noted in the defaults file
+	if [ -z "$OPTIONS" ]; then
+		log_warning_msg "Options (OPTIONS) undefined in $1, using default (-c -m /var/run/saslauthd)"
+		OPTIONS="-c -m /var/run/saslauthd"
+	fi
+
 	# 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, fail.
-        log_failure_msg "No run directory defined for $NAME, not starting"
+		log_failure_msg "No run directory defined for $NAME, not starting"
 		return 1
 	fi
 	PIDFILE=$RUN_DIR/saslauthd.pid
@@ -172,12 +178,18 @@
 		NAME=default
 	fi
 
+	# Set OPTIONS to a default value, as noted in the defaults file
+	if [ -z "$OPTIONS" ]; then
+		log_warning_msg "Options (OPTIONS) undefined in $1, using default (-c -m /var/run/saslauthd)"
+		OPTIONS="-c -m /var/run/saslauthd"
+	fi
+
 	# 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, fail.
-        log_failure_msg "No run directory defined for $NAME, cannot stop"
+		log_failure_msg "No run directory defined for $NAME, cannot stop"
 		return 2
 	fi
 	PIDFILE=$RUN_DIR/saslauthd.pid
@@ -224,12 +236,18 @@
 		NAME=default
 	fi
 
+	# Set OPTIONS to a default value, as noted in the defaults file
+	if [ -z "$OPTIONS" ]; then
+		log_warning_msg "Options (OPTIONS) undefined in $1, using default (-c -m /var/run/saslauthd)"
+		OPTIONS="-c -m /var/run/saslauthd"
+	fi
+
 	# 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, fail.
-        log_failure_msg "No run directory defined for $NAME, cannot reload"
+		log_failure_msg "No run directory defined for $NAME, cannot reload"
 		return 2
 	fi
 	PIDFILE=$RUN_DIR/saslauthd.pid