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

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Wed Nov  1 20:43:28 2006
New Revision: 112

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=112
Log:
Quote user-supplied variable in saslauthd init script.

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=112&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Wed Nov  1 20:43:28 2006
@@ -9,10 +9,12 @@
   * debian/sasl2-bin.saslauthd.init: fix typo on line 31.
   * debian/sasl2-bin.saslauthd.init: if daemon is already running or already
     stopped, reflect this fact in the start or stop message, respectively.
+  * debian/sasl2-bin.saslauthd.init: quote the user-supplied variable on
+    line 51 to avoid errors when it contains a space-separated list.
   * debian/rules: socket directory is /var/run/saslauthd, fix typo.
   * debian/sasl2-bin.saslauthd.default: -T option doesn't work, remove.
 
- -- Fabian Fagerholm <fabbe at debian.org>  Wed,  1 Nov 2006 21:27:51 +0200
+ -- Fabian Fagerholm <fabbe at debian.org>  Wed,  1 Nov 2006 21:41:19 +0200
 
 cyrus-sasl2 (2.1.22-0~pre04) experimental; 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=112&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Wed Nov  1 20:43:28 2006
@@ -48,7 +48,7 @@
 fi
 
 # If no mechanisms are defined, log this and exit
-if [ -z $MECHANISMS ]; then
+if [ -z "$MECHANISMS" ]; then
 	log_failure_msg "No mechanisms defined in /etc/default/$NAME," \
 			"not starting $NAME"
 	exit $EXIT_ERROR_CODE
@@ -90,7 +90,7 @@
 		--exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --name $NAME \
-		--exec $DAEMON -- $DAEMON_ARGS \
+		--exec $DAEMON -- "$DAEMON_ARGS" \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
@@ -192,7 +192,6 @@
 	esac
 	;;
   *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 	exit 3
 	;;