Fixes for bugs #23175 and #23075

2 files changed, 20 insertions, 1 deletions

diff --git a/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1 b/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
new file mode 100644
index 000000000000..160668f3297e
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
@@ -0,0 +1,19 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1,v 1.1 2003/06/22 17:28:04 raker Exp $
+
+# Config file for /etc/init.d/saslauthd
+
+# Authentications mechanism (for list see saslauthd -v)
+# Examples: getpwent pam rimap shadow ldap
+SASL_AUTHMECH=pam
+
+# Put other startup options here.  Many options have changed recently.
+# Use -O to do things previously broken out into separate flags.
+SASL_DAEMON_OPTS=""
+
+# Tack the above options together
+[ -n ${SASL_AUTHMECH} ] && \
+	SASLAUTHD_OPTS="-a ${SASL_AUTHMECH}"
+[ -n ${SASL_DAEMON_OPTS} ] && \
+	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} ${SASL_DAEMON_OPTS}"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
index d70408e8046c..eb0d8ae5dc8c 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
@@ -16,6 +16,6 @@ start() {
 
 stop() {
 	ebegin "Stopping saslauthd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/mux.pid
+	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid
 	eend $?
 }