diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2006-08-07 08:51:57 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2006-08-07 08:51:57 +0000 |
| commit | 87b354e857e98da2f8b60d09e7e0d174a2f1bda9 (patch) | |
| tree | b26cb8833d7bcb321147be297ee39f9b38ea88c8 /pop3.c | |
| parent | c37b5d80dcbc0b30427ac7671b9eccd8856b1579 (diff) | |
| download | fetchmail-87b354e857e98da2f8b60d09e7e0d174a2f1bda9.tar.gz fetchmail-87b354e857e98da2f8b60d09e7e0d174a2f1bda9.tar.bz2 fetchmail-87b354e857e98da2f8b60d09e7e0d174a2f1bda9.zip | |
Log opportunistic TLS upgrades in verbose mode.
svn path=/branches/BRANCH_6-3/; revision=4881
Diffstat (limited to 'pop3.c')
| -rw-r--r-- | pop3.c | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -449,21 +449,25 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) ok = gen_transact(sock, "STLS"); /* We use "tls1" instead of ctl->sslproto, as we want STLS, - * not other SSL protocols - */ + * not other SSL protocols */ if (ok == PS_SUCCESS && - SSLOpen(sock,ctl->sslcert,ctl->sslkey,"tls1",ctl->sslcertck, ctl->sslcertpath,ctl->sslfingerprint,realhost,ctl->server.pollname) == -1) + SSLOpen(sock,ctl->sslcert,ctl->sslkey,"tls1",ctl->sslcertck, + ctl->sslcertpath,ctl->sslfingerprint, + realhost,ctl->server.pollname) == -1) { if (!ctl->sslproto && !ctl->wehaveauthed) { ctl->sslproto = xstrdup(""); - /* repoll immediately */ - return(PS_REPOLL); + /* repoll immediately without TLS */ + return PS_REPOLL; } report(stderr, GT_("SSL connection failed.\n")); - return PS_SOCKET; - } + return PS_SOCKET; + } else { + if (outlevel >= O_VERBOSE && !ctl->sslproto) + report(stdout, GT_("%s: opportunistic upgrade to TLS.\n"), realhost); + } did_stls = TRUE; /* |