changeset 18092:ef8b7e44e96c

lib-master: Don't even attempt to initialize SSL context if ssl=no
author Timo Sirainen <tss@iki.fi>
date Sat, 15 Nov 2014 00:30:06 +0200
parents 2d87ec863b76
children 372de41933c0
files src/lib-master/master-service-ssl.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-master/master-service-ssl.c	Sat Nov 15 00:27:27 2014 +0200
+++ b/src/lib-master/master-service-ssl.c	Sat Nov 15 00:30:06 2014 +0200
@@ -106,6 +106,10 @@
 	i_assert(service->listeners != NULL || service->socket_count == 0);
 
 	set = master_service_ssl_settings_get(service);
+	if (strcmp(set->ssl, "no") == 0) {
+		/* SSL disabled, don't use it */
+		return;
+	}
 
 	memset(&ssl_set, 0, sizeof(ssl_set));
 	ssl_set.protocols = set->ssl_protocols;