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 bb545d0bc9e893563bc264af3f00202c95da6442..8d2832b907d9b5d4ab2fc93a791754c5127c41cb 100644 (file)
--- 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;