From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 17 Jan 2018 10:14:22 +0000 (+0200)
Subject: mail-crypt: Contexts are now required or checked
X-Git-Tag: 2.3.9~2478
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b8e42f398e33019ed65672ba5d0ab79d1c2310b;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Contexts are now required or checked

Satisfies static analyzers
---

diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
index 8fc6216e8b..a9c42baafd 100644
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -17,7 +17,7 @@
 #include "mail-crypt-plugin.h"
 
 #define MAIL_CRYPT_ACL_LIST_CONTEXT(obj) \
-	MODULE_CONTEXT(obj, mail_crypt_acl_mailbox_list_module)
+	MODULE_CONTEXT_REQUIRE(obj, mail_crypt_acl_mailbox_list_module)
 
 struct mail_crypt_acl_mailbox_list {
 	union mailbox_list_module_context module_ctx;
diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index bdd80eba37..d03bdb8263 100644
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -34,9 +34,9 @@ struct mail_crypt_mailbox {
 const char *mail_crypt_plugin_version = DOVECOT_ABI_VERSION;
 
 #define MAIL_CRYPT_MAIL_CONTEXT(obj) \
-	MODULE_CONTEXT(obj, mail_crypt_mail_module)
+	MODULE_CONTEXT_REQUIRE(obj, mail_crypt_mail_module)
 #define MAIL_CRYPT_CONTEXT(obj) \
-	MODULE_CONTEXT(obj, mail_crypt_storage_module)
+	MODULE_CONTEXT_REQUIRE(obj, mail_crypt_storage_module)
 #define MAIL_CRYPT_USER_CONTEXT(obj) \
 	MODULE_CONTEXT(obj, mail_crypt_user_module)