From 000edd79d2842ce7bb4d00c67e35b6f787952667 Mon Sep 17 00:00:00 2001 From: Vincent Brillault Date: Wed, 11 Nov 2020 15:15:04 +0100 Subject: [PATCH] doveadm-mail-server: configure TLS on non proxied request When remotely calling doveadm through the 'socket-path' argument, without doveadm_port configured (not on a proxy host), we still need to configure TLS in case the remote endpoint uses TLS --- src/doveadm/doveadm-mail-server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c index 5d393882e4..999a487cba 100644 --- a/src/doveadm/doveadm-mail-server.c +++ b/src/doveadm/doveadm-mail-server.c @@ -196,14 +196,14 @@ doveadm_mail_server_user_get_host(struct doveadm_mail_cmd_context *ctx, *host_r = ctx->set->doveadm_socket_path; *port_r = ctx->set->doveadm_port; - if (ctx->set->doveadm_port == 0) - return 0; - if (strcmp(ctx->set->doveadm_ssl, "ssl") == 0) *ssl_flags_r |= PROXY_SSL_FLAG_YES; else if (strcmp(ctx->set->doveadm_ssl, "starttls") == 0) *ssl_flags_r |= PROXY_SSL_FLAG_YES | PROXY_SSL_FLAG_STARTTLS; + if (ctx->set->doveadm_port == 0) + return 0; + /* make sure we have an auth connection */ mail_storage_service_init_settings(ctx->storage_service, input);