aboutsummaryrefslogtreecommitdiffstats
path: root/pop3.c
diff options
context:
space:
mode:
Diffstat (limited to 'pop3.c')
-rw-r--r--pop3.c27
1 files changed, 26 insertions, 1 deletions
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