From f077de8e8d6eb2f0c3ccadf6a38611fb14a1f89f Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 19 Feb 2001 08:11:35 +0000
Subject: Enable user to suppress Kerberos and GSSAPI.

svn path=/trunk/; revision=3117
---
 pop3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pop3.c')

diff --git a/pop3.c b/pop3.c
index 8815d11b..2b6d77dc 100644
--- a/pop3.c
+++ b/pop3.c
@@ -250,12 +250,17 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	    }
 
 #if defined(GSSAPI)
-	    if (has_kerberos)
+	    if ((ctl->server.preauthenticate == A_ANY 
+		 || ctl->server.preauthenticate==A_GSSAPI)
+		&& has_gssapi)
 		return(do_gssauth(sock, "AUTH", 
 				  ctl->server.truename, ctl->remotename));
 #endif /* defined(GSSAPI) */
 #if defined(KERBEROS_V4) || defined(KERBEROS_V5)
-	    if (has_kerberos)
+	    if ((ctl->server.preauthenticate == A_ANY 
+		 || ctl->server.preauthenticate==A_KERBEROS_V4
+		 || ctl->server.preauthenticate==A_KERBEROS_V5)
+		&& has_kerberos)
 		return(do_rfc1731(sock, "AUTH", ctl->server.truename));
 #endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
 	    if (has_cram)
-- 
cgit v1.2.3