From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 23 Dec 2017 18:40:09 +0000 (+0100)
Subject: submission-login: Fixed handling of ssl=required for trusted connections.
X-Git-Tag: 2.3.9~2612
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df957821a4b2e2d8708aa35cfe30860ee71af686;p=thirdparty%2Fdovecot%2Fcore.git

submission-login: Fixed handling of ssl=required for trusted connections.

Normally, SSL is not required for trusted connections (e.g. localhost), but submission-login did not follow this standard.
---

diff --git a/src/submission-login/client.c b/src/submission-login/client.c
index bb545d0bc9..8d2832b907 100644
--- a/src/submission-login/client.c
+++ b/src/submission-login/client.c
@@ -74,7 +74,8 @@ static void submission_client_create(struct client *client,
 		smtp_set.capabilities |= SMTP_CAPABILITY_STARTTLS;
 	smtp_set.hostname = subm_client->set->hostname;
 	smtp_set.login_greeting = client->set->login_greeting;
-	smtp_set.tls_required = (strcmp(client->ssl_set->ssl, "required") == 0);
+	smtp_set.tls_required = !client->secured &&
+		(strcmp(client->ssl_set->ssl, "required") == 0);
 	smtp_set.xclient_extensions = xclient_extensions;
 	smtp_set.debug = client->set->auth_debug;