Enable user to suppress Kerberos and GSSAPI.

svn path=/trunk/; revision=3117

diff --git a/pop3.c b/pop3.c
index 8815d11b2416b97bb2c1f593e5a9d0aed48d44ff..2b6d77dc2f4318d126bb9f3228ae5cc5779c629e 100644 (file)
--- 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)