diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2003-08-06 04:31:11 +0000 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2003-08-06 04:31:11 +0000 |
commit | 2cec9def937bc3f3b08ca1afeb9cf80413d8e4b4 (patch) | |
tree | 429c386abc29ea48315c00ef69062ca453f2679b /pop3.c | |
parent | a5a7f5681a22b4e3fbdd0c4261af38cb1c064490 (diff) | |
download | fetchmail-2cec9def937bc3f3b08ca1afeb9cf80413d8e4b4.tar.gz fetchmail-2cec9def937bc3f3b08ca1afeb9cf80413d8e4b4.tar.bz2 fetchmail-2cec9def937bc3f3b08ca1afeb9cf80413d8e4b4.zip |
Ready to ship.
svn path=/trunk/; revision=3831
Diffstat (limited to 'pop3.c')
-rw-r--r-- | pop3.c | 27 |
1 files changed, 26 insertions, 1 deletions
@@ -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 |