From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 13 Oct 2020 20:56:25 +0000 (+0200)
Subject: lib-master: master-service-ssl - Make context initialization error more useful.
X-Git-Tag: 2.3.13~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b90fbfcc341dd5c13cf89720095cfbaba627982;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: master-service-ssl - Make context initialization error more useful.

This improves the error in case SSL is disabled; other causes still yield a
rather unhelpful error message.
---

diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index c0315cf791..906ad072ed 100644
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -21,13 +21,15 @@ int master_service_ssl_init(struct master_service *service,
 
 	i_assert(service->ssl_ctx_initialized);
 
+	set = master_service_ssl_settings_get(service);
 	if (service->ssl_ctx == NULL) {
-		*error_r = "Failed to initialize SSL context";
+		if (strcmp(set->ssl, "no") == 0)
+			*error_r = "SSL is disabled (ssl=no)";
+		else
+			*error_r = "Failed to initialize SSL context";
 		return -1;
 	}
 
-	set = master_service_ssl_settings_get(service);
-
 	i_zero(&ssl_set);
 	ssl_set.verbose = set->verbose_ssl;
 	ssl_set.verify_remote_cert = set->ssl_verify_client_cert;