From 2cec9def937bc3f3b08ca1afeb9cf80413d8e4b4 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 6 Aug 2003 04:31:11 +0000
Subject: Ready to ship.

svn path=/trunk/; revision=3831
---
 pop3.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'pop3.c')

diff --git a/pop3.c b/pop3.c
index 1c06c207..3d894160 100644
--- a/pop3.c
+++ b/pop3.c
@@ -224,6 +224,17 @@ static int capa_probe(sock)
 {
     int	ok;
 
+#if defined(GSSAPI)
+    has_gssapi = FALSE;
+#endif /* defined(GSSAPI) */
+#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
+    has_kerberos = FALSE;
+#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
+    has_cram = FALSE;
+#ifdef OPIE_ENABLE
+    has_otp = FALSE;
+#endif /* OPIE_ENABLE */
+
     ok = gen_transact(sock, "CAPA");
     if (ok == PS_SUCCESS)
     {
@@ -270,6 +281,20 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
     flag did_stls = FALSE;
 #endif /* SSL_ENABLE */
 
+#if defined(GSSAPI)
+    has_gssapi = FALSE;
+#endif /* defined(GSSAPI) */
+#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
+    has_kerberos = FALSE;
+#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
+    has_cram = FALSE;
+#ifdef OPIE_ENABLE
+    has_otp = FALSE;
+#endif /* OPIE_ENABLE */
+#ifdef SSL_ENABLE
+    has_ssl = FALSE;
+#endif /* SSL_ENABLE */
+
     if (ctl->server.authenticate == A_SSH) {
         return PS_SUCCESS;
     }
@@ -342,7 +367,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	 */
 	if (ctl->server.authenticate == A_ANY)
 	{
-	    if (capa_probe(sock) != PS_SUCCESS)
+	    if ((ok = capa_probe(sock)) != PS_SUCCESS)
 	    /* we are in STAGE_GETAUTH! */
 		if (ok == PS_AUTHFAIL ||
 		    /* Some servers directly close the socket. However, if we
-- 
cgit v1.2.3