dovecot-2.0: mail storage service: Exported modules as mail_stor...

dovecot at dovecot.org dovecot at dovecot.org
Mon Mar 8 17:29:24 EET 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/02d4cc578d4b
changeset: 10857:02d4cc578d4b
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Mar 08 17:27:26 2010 +0200
description:
mail storage service: Exported modules as mail_storage_service_modules.

diffstat:

 src/lib-storage/mail-storage-service.c |  12 +++++++-----
 src/lib-storage/mail-storage-service.h |   5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r 8f8d2f8e029c -r 02d4cc578d4b src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Mon Mar 08 17:26:58 2010 +0200
+++ b/src/lib-storage/mail-storage-service.c	Mon Mar 08 17:27:26 2010 +0200
@@ -63,7 +63,7 @@
 	struct setting_parser_context *set_parser;
 };
 
-static struct module *modules = NULL;
+struct module *mail_storage_service_modules = NULL;
 
 static void set_keyval(struct setting_parser_context *set_parser,
 		       const char *key, const char *value)
@@ -712,8 +712,10 @@
 	mod_set.require_init_funcs = TRUE;
 	mod_set.debug = mail_set->mail_debug;
 
-	modules = module_dir_load_missing(modules, user_set->mail_plugin_dir,
-					  user_set->mail_plugins, &mod_set);
+	mail_storage_service_modules =
+		module_dir_load_missing(mail_storage_service_modules,
+					user_set->mail_plugin_dir,
+					user_set->mail_plugins, &mod_set);
 }
 
 int mail_storage_service_lookup(struct mail_storage_service_ctx *ctx,
@@ -833,7 +835,7 @@
 
 	/* privileges are dropped. initialize plugins that haven't been
 	   initialized yet. */
-	module_dir_init(modules);
+	module_dir_init(mail_storage_service_modules);
 
 	/* we couldn't do chrooting, so if chrooting was enabled fix
 	   the home directory */
@@ -968,7 +970,7 @@
 		master_service_settings_cache_deinit(&ctx->set_cache);
 	pool_unref(&ctx->pool);
 
-	module_dir_unload(&modules);
+	module_dir_unload(&mail_storage_service_modules);
 	mail_storage_deinit();
 	dict_drivers_unregister_builtin();
 }
diff -r 8f8d2f8e029c -r 02d4cc578d4b src/lib-storage/mail-storage-service.h
--- a/src/lib-storage/mail-storage-service.h	Mon Mar 08 17:26:58 2010 +0200
+++ b/src/lib-storage/mail-storage-service.h	Mon Mar 08 17:27:26 2010 +0200
@@ -6,6 +6,8 @@
 struct master_service;
 struct mail_user;
 struct setting_parser_context;
+struct setting_parser_info;
+struct mail_storage_service_user;
 
 enum mail_storage_service_flags {
 	/* Fail if we don't drop root privileges */
@@ -39,8 +41,7 @@
 	const char *const *userdb_fields;
 };
 
-struct setting_parser_info;
-struct mail_storage_service_user;
+extern struct module *mail_storage_service_modules;
 
 struct mail_storage_service_ctx *
 mail_storage_service_init(struct master_service *service,


More information about the dovecot-cvs mailing list