Updated authenticator choosing mechanism to address bug #7324.

4 files changed, 33 insertions, 19 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 1f683e69ca60..b8214d94014a 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.13 2002/08/30 11:35:17 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.14 2002/09/11 15:45:46 raker Exp $
 
-  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+*courier-imap-1.5.1 (03 Aug 2002)
 
-  Added ppc to keywords.
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.1.ebuild, files/authdaemond.conf,
+  files/authdaemond.rc6 :
+  Updated authenticator choosing mechanism.  Removed pgsql authenticator
+  as it is not a supported backend.
 
-*courier-imap-1.5.1 (03 Aug 2002)
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+  Added ppc to keywords.
 
   03 Aug 2002; Nick Hadaway <raker@gentoo.org>
   courier-imap-1.5.1.ebuild, files/digest-courier-imap-1.5.1 :
diff --git a/net-mail/courier-imap/courier-imap-1.5.1.ebuild b/net-mail/courier-imap/courier-imap-1.5.1.ebuild
index c9b1e2065b97..cc4e95dedceb 100644
--- a/net-mail/courier-imap/courier-imap-1.5.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.1.ebuild,v 1.3 2002/08/30 11:35:17 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.1.ebuild,v 1.4 2002/09/11 15:45:46 raker Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
@@ -102,6 +102,9 @@ src_install () {
 	do
 		mv ${x}.dist ${x}
 	done
+	
+	insinto /etc/courier-imap
+	doins ${FILESDIR}/authdaemond.conf
 
 	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
 	for service in imapd pop3d
@@ -142,8 +145,6 @@ src_install () {
 	dodir /usr/bin
 	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
 
-	# courier-imap comes with pam_stack aware pam.d/ files already
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
 }
 
 pkg_postinst() {
@@ -156,4 +157,9 @@ pkg_postinst() {
 	einfo "If you choose not to switch your init files, you server will "
 	einfo "continue to function as it currently does."
 	echo
+	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
+	einfo "you would like to use something other than the"
+	einfo "authdaemond.plain authenticator"
+	echo
+
 }
diff --git a/net-mail/courier-imap/files/authdaemond.conf b/net-mail/courier-imap/files/authdaemond.conf
new file mode 100644
index 000000000000..255ea22e2c8a
--- /dev/null
+++ b/net-mail/courier-imap/files/authdaemond.conf
@@ -0,0 +1,12 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond.conf,v 1.1 2002/09/11 15:45:46 raker Exp $
+
+# This file should contain your chosen authenticator
+# Valid choices are..
+#
+# AUTHDAEMOND="authdaemond.mysql"
+# AUTHDAEMOND="authdaemond.ldap"
+# AUTHDAEMOND="authdaemond.plain"
+#
+AUTHDAEMOND="authdaemond.plain"
diff --git a/net-mail/courier-imap/files/authdaemond.rc6 b/net-mail/courier-imap/files/authdaemond.rc6
index 40e66c80ae8c..eb6f252c2bd4 100644
--- a/net-mail/courier-imap/files/authdaemond.rc6
+++ b/net-mail/courier-imap/files/authdaemond.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond.rc6,v 1.2 2002/07/22 23:23:51 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond.rc6,v 1.3 2002/09/11 15:45:46 raker Exp $
 
 depend() {
 	need net
@@ -15,20 +15,11 @@ checkconfig() {
 }
 
 setauth() {
+
 	source /etc/courier-imap/authdaemonrc
 	AUTHLIB="/usr/lib/courier-imap/authlib"
+	source /etc/courier-imap/authdaemond.conf
 
-	if [ "${version}" != "" ] ; then
-			AUTHDAEMOND="$version"
-		elif [ -x $AUTHLIB/authdaemond.pgsql ] ; then
-			AUTHDAEMOND="authdaemond.pgsql"
-		elif [ -x $AUTHLIB/authdaemond.mysql ] ; then
-			AUTHDAEMOND="authdaemond.mysql"
-		elif [ -x $AUTHLIB/authdaemond.ldap ] ; then
-			AUTHDAEMOND="authdaemond.ldap"
-		else 
-			AUTHDAEMOND="authdaemond.plain"
-	fi
 }
 
 start() {