From 1b20ea028847e8c6b90db6f8b85a31c193d3f725 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Thu, 26 Aug 2021 23:53:14 +0200 Subject: IMAP: report 'upgrade to TLS succeeded' before CAPA probe ...after successful STARTTLS, to show the logical order of events. --- imap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'imap.c') diff --git a/imap.c b/imap.c index d7f0f78b..5996a540 100644 --- a/imap.c +++ b/imap.c @@ -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. */ -- cgit v1.2.3