dovecot-2.2: login: Don't fail at startup by trying to load SSL ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/effecdd32cb0
changeset: 15962:effecdd32cb0
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 25 20:04:10 2013 +0200
description:
login: Don't fail at startup by trying to load SSL plugin.

diffstat:

 src/lib-master/master-service.c |  3 ++-
 src/lib-master/master-service.h |  4 +++-
 src/login-common/main.c         |  3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r e47910ee4459 -r effecdd32cb0 src/lib-master/master-service.c
--- a/src/lib-master/master-service.c	Mon Feb 25 19:52:40 2013 +0200
+++ b/src/lib-master/master-service.c	Mon Feb 25 20:04:10 2013 +0200
@@ -442,7 +442,8 @@
 						  master_status_error, service);
 	}
 	master_service_io_listeners_add(service);
-	if (service->want_ssl_settings)
+	if (service->want_ssl_settings &&
+	    (service->flags & MASTER_SERVICE_FLAG_NO_SSL_INIT) == 0)
 		master_service_ssl_ctx_init(service);
 
 	if ((service->flags & MASTER_SERVICE_FLAG_STD_CLIENT) != 0) {
diff -r e47910ee4459 -r effecdd32cb0 src/lib-master/master-service.h
--- a/src/lib-master/master-service.h	Mon Feb 25 19:52:40 2013 +0200
+++ b/src/lib-master/master-service.h	Mon Feb 25 20:04:10 2013 +0200
@@ -26,7 +26,9 @@
 	/* SSL settings are always looked up when we have ssl listeners.
 	   This flag enables looking up SSL settings even without ssl
 	   listeners (i.e. the service does STARTTLS). */
-	MASTER_SERVICE_FLAG_USE_SSL_SETTINGS	= 0x200
+	MASTER_SERVICE_FLAG_USE_SSL_SETTINGS	= 0x200,
+	/* Don't initialize SSL context automatically. */
+	MASTER_SERVICE_FLAG_NO_SSL_INIT		= 0x400
 };
 
 struct master_service_connection {
diff -r e47910ee4459 -r effecdd32cb0 src/login-common/main.c
--- a/src/login-common/main.c	Mon Feb 25 19:52:40 2013 +0200
+++ b/src/login-common/main.c	Mon Feb 25 20:04:10 2013 +0200
@@ -365,7 +365,8 @@
 	enum master_service_flags service_flags =
 		MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN |
 		MASTER_SERVICE_FLAG_TRACK_LOGIN_STATE |
-		MASTER_SERVICE_FLAG_USE_SSL_SETTINGS;
+		MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
+		MASTER_SERVICE_FLAG_NO_SSL_INIT;
 	pool_t set_pool;
 	bool allow_core_dumps = FALSE;
 	const char *login_socket;