From: Timo Sirainen <tss@iki.fi>
Date: Wed, 7 Jul 2010 14:20:17 +0000 (+0100)
Subject: imap plugins now give a nicer error if tried to be loaded for non-imap binary.
X-Git-Tag: 2.0.rc2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8552b0cad8ffe9ccb8270577ba28b8010c89af11;p=thirdparty%2Fdovecot%2Fcore.git

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 d2e1c8080b..9991c09e0d 100644
--- 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 bf3b51954a..d17312450d 100644
--- 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 0435ac6331..b15478a495 100644
--- 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 bd673f4fde..f4629aba35 100644
--- 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 dc0ed542a1..1e55d108b8 100644
--- 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 74a60d1269..502d8a563e 100644
--- 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 1fb39eb4a2..251bb23e2d 100644
--- 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);