From: Timo Sirainen <tss@iki.fi>
Date: Sun, 5 Oct 2008 11:22:13 +0000 (+0300)
Subject: dict: Register dicts only after loading modules. This allows using SQL drivers from... 
X-Git-Tag: 1.2.alpha2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d58676deb466d7ce91521de76cac64d0a86e501b;p=thirdparty%2Fdovecot%2Fcore.git

dict: Register dicts only after loading modules. This allows using SQL drivers from modules.

--HG--
branch : HEAD
---

diff --git a/src/dict/main.c b/src/dict/main.c
index 716be34fe4..e2b78145c4 100644
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -74,11 +74,13 @@ static void main_init(void)
 	/* If master dies, the log fd gets closed and we'll quit */
 	log_io = io_add(STDERR_FILENO, IO_ERROR, log_error_callback, NULL);
 
-	dict_drivers_register_all();
-
 	modules = module_dir_load(DICT_MODULE_DIR, NULL, TRUE, version);
 	module_dir_init(modules);
 
+	/* Register only after loading modules. They may contain SQL drivers,
+	   which we'll need to register. */
+	dict_drivers_register_all();
+
 	path = getenv("DICT_LISTEN_FROM_FD");
 	fd = path == NULL ? -1 : DICT_MASTER_LISTENER_FD;
 	if (path == NULL)