Mercurial > dovecot > core-2.2

changeset 11265:3fc759d5e736 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: Unload modules at exit.
author Timo Sirainen <tss@iki.fi>
date Wed, 05 May 2010 16:46:12 +0300
parents 3afbdf732a75
children 4c71be924a00
files src/config/config-parser.c src/config/config-parser.h src/config/doveconf.c src/config/main.c
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/config/config-parser.c	Tue May 04 22:00:41 2010 +0300
+++ b/src/config/config-parser.c	Wed May 05 16:46:12 2010 +0300
@@ -34,6 +34,7 @@
 
 struct config_module_parser *config_module_parsers;
 struct config_filter_context *config_filter;
+struct module *modules;
 
 static const char *info_type_name_find(const struct setting_parser_info *info)
 {
@@ -844,7 +845,7 @@
 void config_parse_load_modules(void)
 {
 	struct module_dir_load_settings mod_set;
-	struct module *modules, *m;
+	struct module *m;
 	const struct setting_parser_info **roots;
 	ARRAY_DEFINE(new_roots, const struct setting_parser_info *);
 	ARRAY_TYPE(service_settings) new_services;
--- a/src/config/config-parser.h	Tue May 04 22:00:41 2010 +0300
+++ b/src/config/config-parser.h	Wed May 05 16:46:12 2010 +0300
@@ -12,6 +12,7 @@
 
 extern struct config_module_parser *config_module_parsers;
 extern struct config_filter_context *config_filter;
+extern struct module *modules;
 
 int config_parse_file(const char *path, bool expand_values, const char *module,
 		      const char **error_r);
--- a/src/config/doveconf.c	Tue May 04 22:00:41 2010 +0300
+++ b/src/config/doveconf.c	Wed May 05 16:46:12 2010 +0300
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "array.h"
 #include "abspath.h"
+#include "module-dir.h"
 #include "env-util.h"
 #include "ostream.h"
 #include "str.h"
@@ -592,6 +593,7 @@
 		i_fatal("Errors in configuration");
 
 	config_filter_deinit(&config_filter);
+	module_dir_unload(&modules);
 	master_service_deinit(&master_service);
         return 0;
 }
--- a/src/config/main.c	Tue May 04 22:00:41 2010 +0300
+++ b/src/config/main.c	Wed May 05 16:46:12 2010 +0300
@@ -1,8 +1,7 @@
 /* Copyright (c) 2005-2010 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
-#include "array.h"
-#include "env-util.h"
+#include "module-dir.h"
 #include "restrict-access.h"
 #include "master-service.h"
 #include "config-connection.h"
@@ -37,6 +36,7 @@
 	config_connections_destroy_all();
 
 	config_filter_deinit(&config_filter);
+	module_dir_unload(&modules);
 	master_service_deinit(&master_service);
         return 0;
 }