dovecot-2.2: lib-master: Don't even attempt to initialize SSL co...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ef8b7e44e96c
changeset: 18092:ef8b7e44e96c
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Nov 15 00:30:06 2014 +0200
description:
lib-master: Don't even attempt to initialize SSL context if ssl=no

diffstat:

 src/lib-master/master-service-ssl.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r 2d87ec863b76 -r ef8b7e44e96c src/lib-master/master-service-ssl.c
--- 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;