imap plugins now give a nicer error if tried to be loaded for non-imap binary.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index d2e1c8080bd47c12a67aad6598543218dab31a07..9991c09e0d044fa6116bc521bbf55179cede06bc 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -706,6 +706,7 @@ mail_storage_service_load_modules(struct mail_storage_service_ctx *ctx,
 
        memset(&mod_set, 0, sizeof(mod_set));
        mod_set.version = master_service_get_version_string(ctx->service);
+       mod_set.binary_name = master_service_get_name(ctx->service);
        mod_set.require_init_funcs = TRUE;
        mod_set.debug = mail_user_set_get_mail_debug(user_info, user_set);
 

diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c
index bf3b51954a0cb5cec4102d311f62190c3e737028..d17312450d33d00535d870f11e58a961e1d01a8f 100644 (file)
--- a/src/plugins/imap-acl/imap-acl-plugin.c
+++ b/src/plugins/imap-acl/imap-acl-plugin.c
@@ -647,3 +647,4 @@ void imap_acl_plugin_deinit(void)
 }
 
 const char *imap_acl_plugin_dependencies[] = { "acl", NULL };
+const char imap_acl_plugin_binary_dependency[] = "imap";

diff --git a/src/plugins/imap-acl/imap-acl-plugin.h b/src/plugins/imap-acl/imap-acl-plugin.h
index 0435ac6331e6de0afb51d6116fedb03888c202c0..b15478a495b1352ec51e4c998c1d945cd93bda15 100644 (file)
--- a/src/plugins/imap-acl/imap-acl-plugin.h
+++ b/src/plugins/imap-acl/imap-acl-plugin.h
@@ -2,6 +2,7 @@
 #define IMAP_ACL_PLUGIN_H
 
 extern const char *imap_acl_plugin_dependencies[];
+extern const char imap_acl_plugin_binary_dependency[];
 
 void imap_acl_plugin_init(struct module *module);
 void imap_acl_plugin_deinit(void);

diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c
index bd673f4fde228eba7fd5377afa501448ed5d52d4..f4629aba352839556c5f8c6745a733a9991b18a0 100644 (file)
--- a/src/plugins/imap-quota/imap-quota-plugin.c
+++ b/src/plugins/imap-quota/imap-quota-plugin.c
@@ -235,3 +235,4 @@ void imap_quota_plugin_deinit(void)
 }
 
 const char *imap_quota_plugin_dependencies[] = { "quota", NULL };
+const char imap_quota_plugin_binary_dependency[] = "imap";

diff --git a/src/plugins/imap-quota/imap-quota-plugin.h b/src/plugins/imap-quota/imap-quota-plugin.h
index dc0ed542a13e7957d23f156c96a47466a9e2c40b..1e55d108b82153d02f5f4f8b30416d90881b5bbe 100644 (file)
--- a/src/plugins/imap-quota/imap-quota-plugin.h
+++ b/src/plugins/imap-quota/imap-quota-plugin.h
@@ -4,6 +4,7 @@
 struct module;
 
 extern const char *imap_quota_plugin_dependencies[];
+extern const char imap_quota_plugin_binary_dependency[];
 
 void imap_quota_plugin_init(struct module *module);
 void imap_quota_plugin_deinit(void);

diff --git a/src/plugins/imap-zlib/imap-zlib-plugin.c b/src/plugins/imap-zlib/imap-zlib-plugin.c
index 74a60d1269865a2c6c9642f7929272d76871ad42..502d8a563e0c87c1f603c837ae9df78fcbdc90ca 100644 (file)
--- a/src/plugins/imap-zlib/imap-zlib-plugin.c
+++ b/src/plugins/imap-zlib/imap-zlib-plugin.c
@@ -154,3 +154,4 @@ void imap_zlib_plugin_deinit(void)
 }
 
 const char *imap_zlib_plugin_dependencies[] = { "zlib", NULL };
+const char imap_zlib_plugin_binary_dependency[] = "imap";

diff --git a/src/plugins/imap-zlib/imap-zlib-plugin.h b/src/plugins/imap-zlib/imap-zlib-plugin.h
index 1fb39eb4a22e06c953bc6daea11d8539df94ab8a..251bb23e2d59c1cc55df111b7f514ab48fe85939 100644 (file)
--- a/src/plugins/imap-zlib/imap-zlib-plugin.h
+++ b/src/plugins/imap-zlib/imap-zlib-plugin.h
@@ -4,6 +4,7 @@
 struct module;
 
 extern const char *imap_zlib_plugin_dependencies[];
+extern const char imap_zlib_plugin_binary_dependency[];
 
 void imap_zlib_plugin_init(struct module *module);
 void imap_zlib_plugin_deinit(void);