From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 19 Sep 2016 08:08:08 +0000 (+0300)
Subject: lib-ssl-iostream: The final fix to make the SSL plugin loading not fail..
X-Git-Tag: 2.2.26~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d3f0550089ab215fda4865c1fa1ba6da6b4d76f;p=thirdparty%2Fdovecot%2Fcore.git

lib-ssl-iostream: The final fix to make the SSL plugin loading not fail..
---

diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index 836021d1eb..b34e9af706 100644
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -38,6 +38,7 @@ static int ssl_module_load(const char **error_r)
 	if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
 					&mod_set, error_r) < 0)
 		return -1;
+	module_dir_init(ssl_module);
 	if (!ssl_module_loaded) {
 		*error_r = t_strdup_printf(
 			"%s didn't call iostream_ssl_module_init() - SSL not initialized",
@@ -45,7 +46,6 @@ static int ssl_module_load(const char **error_r)
 		module_dir_unload(&ssl_module);
 		return -1;
 	}
-	module_dir_init(ssl_module);
 
 	/* Destroy SSL module after (most of) the others. Especially lib-fs
 	   backends may still want to access SSL module in their own