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

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Aug 13 06:16:54 2007
New Revision: 267

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=267
Log:
Allow running with NAME variable unset, and document how things work now.

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.README.Debian
    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=267&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Aug 13 06:16:54 2007
@@ -2,7 +2,14 @@
 
   * NOT RELEASED YET
 
- -- Fabian Fagerholm <fabbe at debian.org>  Mon,  6 Aug 2007 09:26:56 +0300
+  [ Fabian Fagerholm ]
+  * debian/sasl2-bin.saslauthd.init: allow running with NAME variable unset.
+    (Closes: #436440, #436726)
+  * debian/sasl2-bin.saslauthd.default: better in-file documentation.
+  * debian/sasl2-bin.README.Debian: document what happens if you don't set
+    the NAME variable.
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 13 Aug 2007 09:11:24 +0300
 
 cyrus-sasl2 (2.1.22.dfsg1-14) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.README.Debian
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.README.Debian?rev=267&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.README.Debian (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.README.Debian Mon Aug 13 06:16:54 2007
@@ -85,6 +85,10 @@
  instance! Also note that you MUST set the -m option for EVERY instance.
  Things will break if you don't do these things.
 
+ If you don't set the NAME option, it will be set to "default" and you will
+ not be able to start, stop or reload that instance separately (using the
+ *-instance actions described above).
+
  2. You must also create a statoverride entry to tell the init script
  which permissions you want for the run directory. Example:
   dpkg-statoverride --add root sasl 710 /var/spool/postfix/var/run/saslauthd

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=267&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.default Mon Aug 13 06:16:54 2007
@@ -1,14 +1,17 @@
 #
 # Settings for saslauthd daemon
+# Please read /usr/share/doc/sasl2-bin/README.Debian for details.
 #
 
 # Should saslauthd run automatically on startup? (default: no)
 START=no
 
-# Description of this saslauthd instance. (default: SASL Authentication Daemon)
+# Description of this saslauthd instance. Recommended.
+# (suggestion: SASL Authentication Daemon)
 DESC="SASL Authentication Daemon"
 
-# Short name of this saslauthd instance. (default: saslauthd)
+# Short name of this saslauthd instance. Strongly recommended.
+# (suggestion: saslauthd)
 NAME="saslauthd"
 
 # Which authentication mechanisms should saslauthd use? (default: pam)

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=267&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Mon Aug 13 06:16:54 2007
@@ -81,6 +81,13 @@
 		return 0
 	fi
 
+	# If the short name of this instance is undefined, warn the user
+	# but choose a default name.
+	if [ -z "$NAME" ]; then
+		log_warning_msg "Short name (NAME) undefined in $1, using default"
+		NAME=default
+	fi
+
 	log_daemon_msg "Starting $DESC" "$NAME"
 
 	# Determine run directory and pid file location by looking
@@ -158,6 +165,13 @@
 	# Load defaults file for this instance.
 	. $1
 
+	# If the short name of this instance is undefined, warn the user
+	# but choose a default name.
+	if [ -z "$NAME" ]; then
+		log_warning_msg "Short name (NAME) undefined in $1, using default"
+		NAME=default
+	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}'`
@@ -202,6 +216,13 @@
 {
 	# Load defaults file for this instance.
 	. $1
+
+	# If the short name of this instance is undefined, warn the user
+	# but choose a default name.
+	if [ -z "$NAME" ]; then
+		log_warning_msg "Short name (NAME) undefined in $1, using default"
+		NAME=default
+	fi
 
 	# Determine run directory and pid file location by looking
 	# for an -m option.