[Pkg-cyrus-sasl2-commits] r140 - 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: Thu Nov  9 20:56:43 2006
New Revision: 140

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=140
Log:
Fix saslauthd init script when MECH_OPTIONS is empty, and include a default file example for postfix users.

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=140&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Thu Nov  9 20:56:43 2006
@@ -2,7 +2,12 @@
 
   * NOT RELEASED YET
 
- -- Fabian Fagerholm <fabbe at debian.org>  Thu,  9 Nov 2006 20:50:35 +0200
+  [ Fabian Fagerholm ]
+  * debian/sasl2-bin.saslauthd.init: Fix case when MECH_OPTIONS is empty.
+    (Closes: #397818)
+  * debian/sasl2-bin.saslauthd.default: Include an example for postfix users.
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Thu,  9 Nov 2006 21:01:35 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-1) 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=140&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default Thu Nov  9 20:56:43 2006
@@ -31,5 +31,6 @@
 THREADS=5
 
 # Other options (default: -c)
+# Example for postfix users: "-c -m /var/spool/postfix/var/run/saslauthd"
 # See the saslauthd man page for information about these options.
 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=140&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Thu Nov  9 20:56:43 2006
@@ -54,8 +54,13 @@
 	exit $EXIT_ERROR_CODE
 fi
 
+# If there are mechanism options defined, prepare them for use with the -O flag
+if [ -n "$MECH_OPTIONS" ]; then
+	MECH_OPTIONS="-O $MECH_OPTIONS"
+fi
+
 # Construct argument string
-DAEMON_ARGS="$DAEMON_ARGS -a $MECHANISMS $OPTIONS -O $MECH_OPTIONS -n $THREADS"
+DAEMON_ARGS="$DAEMON_ARGS -a $MECHANISMS $MECH_OPTIONS $OPTIONS -n $THREADS"
 
 #
 # Function that creates a directory with the specified