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

Tue Dec 5 16:48:15 CET 2006

Author: fabbe
Date: Tue Dec  5 16:48:15 2006
New Revision: 172

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=172
Log:
Allow absence of THREADS option 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=172&op=diff
==============================================================================

--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Tue Dec  5 16:48:15 2006
@@ -7,8 +7,11 @@
     Sam Hartman.
   * debian/patches/0015_saslutil_decode64_fix.dpatch: add check to succeed
     when input string is CR or LF terminated, as well. (Closes: #400955)
-
- -- Fabian Fagerholm <fabbe at debian.org>  Tue,  5 Dec 2006 10:58:26 +0200
+  * debian/sasl2-bin.saslauthd.init: if THREADS is not set, don't include
+    the -n option, and let saslauthd fall back to the compiled-in default.
+    (Closes: #401716)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Tue,  5 Dec 2006 17:45:10 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-5) 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=172&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Tue Dec  5 16:48:15 2006
@@ -66,8 +66,13 @@
 	MECH_OPTIONS="-O $MECH_OPTIONS"
 fi
 
+# If there is a threads option defined, prepare it for use with the -n flag
+if [ -n "$THREADS" ]; then
+	THREAD_OPTIONS="-n $THREADS"
+fi
+
 # Construct argument string
-DAEMON_ARGS="$DAEMON_ARGS -a $MECHANISMS $MECH_OPTIONS $OPTIONS -n $THREADS"
+DAEMON_ARGS="$DAEMON_ARGS -a $MECHANISMS $MECH_OPTIONS $OPTIONS $THREAD_OPTIONS"
 
 #
 # Function that creates a directory with the specified


