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 8fc6216e8b3e19aeb2f4efe45804a72c29f63a39..a9c42baafde21ef6db7ee1e1caf1444ca027a96f 100644 (file)
--- 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 bdd80eba37ad8081bb603cca0bbdadc9d01ca15a..d03bdb8263dfc31cd80a07e54fec8ddfffd3743e 100644 (file)
--- 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)