3 files changed, 21 insertions, 20 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index a53578f36022..913dafb716e6 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.53 2004/01/28 14:17:44 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.54 2004/01/28 14:57:45 max Exp $
+
+  28 Jan 2004; Max Kalika <max@gentoo.org> files/saslauthd2.conf:
+  More flexible start-up script config file. Fixes bug 39447 as well.
 
   28 Jan 2004; Max Kalika <max@gentoo.org> cyrus-sasl-1.5.27-r6.ebuild,
   cyrus-sasl-2.1.13.ebuild, cyrus-sasl-2.1.14.ebuild,
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 7e6d55d0cd09..172ef0154083 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -3,12 +3,12 @@ MD5 932faa05d57000adae98609ab35e8325 cyrus-sasl-2.1.15.ebuild 3737
 MD5 adc5fe7dc04f8b77f22bd78960423693 cyrus-sasl-1.5.27-r5.ebuild 2694
 MD5 84f114646461e239b3b929022a0a6223 cyrus-sasl-2.1.17.ebuild 3986
 MD5 0fd8f05934400a8f2bf80c660db959ff cyrus-sasl-2.1.14.ebuild 3911
-MD5 fdc1393f8f91f2724c4e356fb3c8399b ChangeLog 11104
+MD5 e4562c414760aa7921df12997fa1b3fc ChangeLog 11241
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 611c8e37a90576ab707eb03397073c95 files/saslauthd2.conf 905
+MD5 81cec2fe43610499ef4372d0dff44292 files/saslauthd2.conf 745
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
 MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
 MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.conf b/dev-libs/cyrus-sasl/files/saslauthd2.conf
index e9a8cac78c7a..ba8d1be9abf2 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd2.conf
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.conf
@@ -1,24 +1,22 @@
-# 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/saslauthd2.conf,v 1.1 2004/01/28 14:17:44 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.conf,v 1.2 2004/01/28 14:57:45 max Exp $
 
 # Config file for /etc/init.d/saslauthd
 
-# Authentications mechanism (for list see saslauthd -v)
-SASL_AUTHMECH=pam
+# Initial (empty) options.
+SASLAUTHD_OPTS=""
 
-# Hostname for remote IMAP server (if rimap auth mech is used)
-SASL_RIMAP_HOSTNAME=""
+# Specify the authentications mechanism.
+# *NOTE* For list see: saslauthd -v
+SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam"
 
-# Honour time-of-day login restrictions (if shadow auth mech is used)
-# Make this ="" to turn it off.  Putting =no will turn it on!
-SASL_TIME_OF_DAY_LOGIN_RESTRICTIONS=yes
+# Specify the hostname for remote IMAP server.
+# *NOTE* Only needed if rimap auth mech is used.
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
 
+# Specify the number of worker processes to create.
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
 
-# Tack the above options together
-[ -n ${SASL_AUTHMECH} ] && \
-	SASLAUTHD_OPTS="-a ${SASL_AUTHMECH}"
-[ -n ${SASL_RIMAP_HOSTNAME} ] && \
-	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O ${SASL_RIMAP_HOSTNAME}"
-[ -n ${SASL_TIME_OF_DAY_LOGIN_RESTRICTIONS} ] && \
-	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -T"
+# Enable credential cache, cache size, and timeout.
+# *NOTE* Size is measured in kilobytes 
+#        Timeout is measured in seconds
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"