diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2021-08-26 23:53:14 +0200 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2021-08-26 23:53:14 +0200 |
| commit | 1b20ea028847e8c6b90db6f8b85a31c193d3f725 (patch) | |
| tree | 38278fea6726a49b87f99c3b6489052f9865b6a8 | |
| parent | c78cc2fc202f6bb6b44412f9c35bf176261c25f1 (diff) | |
| download | fetchmail-1b20ea028847e8c6b90db6f8b85a31c193d3f725.tar.gz fetchmail-1b20ea028847e8c6b90db6f8b85a31c193d3f725.tar.bz2 fetchmail-1b20ea028847e8c6b90db6f8b85a31c193d3f725.zip | |
IMAP: report 'upgrade to TLS succeeded' before CAPA probe
...after successful STARTTLS, to show the logical order of events.
| -rw-r--r-- | imap.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -466,6 +466,10 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, ctl->server.pollname, &ctl->remotename)) != -1) { + if (outlevel >= O_VERBOSE) + { + report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); + } /* * RFC 2595 says this: * @@ -481,10 +485,6 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) */ if ((ok = capa_probe(sock, ctl))) return ok; - if (outlevel >= O_VERBOSE) - { - report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); - } } else if (must_starttls(ctl)) { /* Config required TLS but we couldn't guarantee it, so we must * stop. */ |