From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 18 May 2018 14:04:36 +0000 (+0300)
Subject: *-login: Fix non-global ssl=no configuration
X-Git-Tag: 2.3.4~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87ea7c341b58e52e73ba4b821a1ea3f8804ee89f;p=thirdparty%2Fdovecot%2Fcore.git

*-login: Fix non-global ssl=no configuration

For example local 127.0.0.2 { ssl=no } wasn't working.
---

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index ba92802052..611535cde8 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -474,6 +474,11 @@ int client_init_ssl(struct client *client)
 
 	i_assert(client->fd != -1);
 
+	if (strcmp(client->ssl_set->ssl, "no") == 0) {
+		client_log(client, "SSL is disabled (ssl=no)");
+		return -1;
+	}
+
 	master_service_ssl_settings_to_iostream_set(client->ssl_set,
 		pool_datastack_create(),
 		MASTER_SERVICE_SSL_SETTINGS_TYPE_SERVER, &ssl_set);