From d6c728ad218f79305ad759eba6d787d125c67ec3 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 11 Feb 2001 23:26:10 +0000
Subject: Let's get rid of the old protocols with preauthentication bundled in.

svn path=/trunk/; revision=3071
---
 fetchmail.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 3b06594d..9e42335a 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -323,13 +323,7 @@ int main(int argc, char **argv)
     {
 	if (ctl->active && !(implicitmode && ctl->server.skip)&&!ctl->password)
 	{
-	    if (ctl->server.preauthenticate == A_KERBEROS_V4 ||
-			ctl->server.preauthenticate == A_KERBEROS_V5 ||
-			ctl->server.preauthenticate == A_SSH ||
-#ifdef GSSAPI
-			ctl->server.protocol == P_IMAP_GSS ||
-#endif /* GSSAPI */
-			ctl->server.protocol == P_IMAP_K4)
+	    if (ctl->server.preauthenticate != A_PASSWORD)
 		/* Server won't care what the password is, but there
 		   must be some non-null string here.  */
 		ctl->password = ctl->remotename;
@@ -499,11 +493,7 @@ int main(int argc, char **argv)
     for (ctl = querylist; ctl; ctl = ctl->next)
     {
 	if (ctl->active && !(implicitmode && ctl->server.skip)
-		&& ctl->server.protocol != P_ETRN
-		&& ctl->server.protocol != P_IMAP_K4
-#ifdef GSSAPI
-		&& ctl->server.protocol != P_IMAP_GSS
-#endif /* GSSAPI */
+		&& ctl->server.preauthenticate == A_PASSWORD
 		&& !ctl->password)
 	{
 	    if (!isatty(0))
@@ -1486,9 +1476,6 @@ static int query_host(struct query *ctl)
 #endif /* POP3_ENABLE */
 	break;
     case P_IMAP:
-    case P_IMAP_K4:
-    case P_IMAP_CRAM_MD5:
-    case P_IMAP_LOGIN:
 #ifdef GSSAPI
     case P_IMAP_GSS:
 #endif /* GSSAPI */
@@ -1578,14 +1565,16 @@ static void dump_params (struct runctl *runp,
 		   ctl->server.skip ? _("will not") : _("will"));
 	/*
 	 * Don't poll for password when there is one or when using the ETRN
-	 * or IMAP-GSS protocol
+	 * or GSSAPI or KERBEROS protocol
 	 */
 	/* ETRN, IMAP_GSS, and IMAP_K4 do not need a password, so skip this */
 	if ( (ctl->server.protocol != P_ETRN)
 #ifdef GSSAPI
-				&& (ctl->server.protocol != P_IMAP_GSS)
+			&& (ctl->server.preauthenticate != A_GSSAPI)
 #endif /* GSSAPI */
-       				&& (ctl->server.protocol != P_IMAP_K4) ) {
+       			&& (ctl->server.preauthenticate != A_KERBEROS_V4) 
+       			&& (ctl->server.preauthenticate != A_KERBEROS_V5)) 
+	{
 		if (!ctl->password)
 			printf(_("  Password will be prompted for.\n"));
 		else if (outlevel >= O_VERBOSE)
-- 
cgit v1.2.3