commit 9169ee8fd8eb774642b371b58df81a783f355f8d
parent 8ba4192b23d3e81e982437c21719480aaabacb2a
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date: Wed, 18 May 2022 17:11:59 +0200
assume Tunnel to be secure more consistently
follows up on 27458133.
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
@@ -2577,9 +2577,9 @@ imap_open_store_authenticate2( imap_store_t *ctx )
if (any || !strcasecmp( mech->string, cmech->string )) {
if (!strcasecmp( cmech->string, "LOGIN" )) {
#ifdef HAVE_LIBSSL
- if (ctx->conn.ssl || !any)
+ if (ctx->conn.ssl || ctx->conn.conf->tunnel || !any)
#else
- if (!any)
+ if (ctx->conn.conf->tunnel || !any)
#endif
auth_login = 1;
else
@@ -2680,7 +2680,7 @@ imap_open_store_authenticate2( imap_store_t *ctx )
if (!ensure_user( srvc ) || !ensure_password( srvc ))
goto bail;
#ifdef HAVE_LIBSSL
- if (!ctx->conn.ssl)
+ if (!ctx->conn.ssl && !ctx->conn.conf->tunnel)
#endif
warn( "*** IMAP Warning *** Password is being sent in the clear\n" );
ctx->caps = 0;