mail storage service: Exported modules as mail_storage_service_modules.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index ae45d13360e79e0ec3e4ebe01dd3e14f60530f60..da285129e320b14b10ca0c4d5e55a4cdc934835c 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -63,7 +63,7 @@ struct mail_storage_service_user {
        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 @@ mail_storage_service_load_modules(struct mail_storage_service_ctx *ctx,
        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 @@ int mail_storage_service_next(struct mail_storage_service_ctx *ctx,
 
        /* 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 @@ void mail_storage_service_deinit(struct mail_storage_service_ctx **_ctx)
                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 --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 46a2f9860f5d29b4b33a5ec4b3068f7d08b9b9d9..56d3277e04d268d45e45cb61998a76c6c694f405 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -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 @@ struct mail_storage_service_input {
        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,