[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 01/01: saslauthd: refuse to start if debug option (-d) is set in options passed to init script (Closes: #558014)

[Roberto C. Sanchez]

This is an automated email from the git hooks/post-receive script.

roberto pushed a commit to branch master
in repository cyrus-sasl2.

commit 89a2e9bc1c1e8481dc8dc271462804d5e9c2d809
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Tue Feb 18 19:20:35 2014 -0500

    saslauthd: refuse to start if debug option (-d) is set in options passed to init script (Closes: #558014)
---
 debian/changelog                | 7 +++++++
 debian/sasl2-bin.saslauthd.init | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f854e1..aac0246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cyrus-sasl2 (2.1.26.dfsg1-9) UNRELEASED; urgency=low
+
+  * saslauthd: refuse to start if debug option (-d) is set in options
+    passed to init script (Closes: #558014)
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 18 Feb 2014 19:19:21 -0500
+
 cyrus-sasl2 (2.1.26.dfsg1-8) unstable; urgency=low
 
   * Fix buginess that results in the keytab configuration option not
diff --git a/debian/sasl2-bin.saslauthd.init b/debian/sasl2-bin.saslauthd.init
index 4d1c437..b47c9e7 100644
--- a/debian/sasl2-bin.saslauthd.init
+++ b/debian/sasl2-bin.saslauthd.init
@@ -101,6 +101,11 @@ start_instance()
 
 	log_daemon_msg "Starting $DESC" "$NAME"
 
+	# Check to see if the debug option is specified; fail if it is
+	if [ `expr match "$OPTIONS" '-d'` -ne 0 ]; then
+		log_failure_msg "The debug option (-d) has been set in /etc/default/saslauthd or elsewhere, not starting"
+		return 1
+	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)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git