mail-crypt: Replace mail_crypt_acl_secure_sharing_enabled() with mail_user_getenv_bool()

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index a4322ed310984ba051e672a9c63c5cc1402e42fb..780c47e7a38e4316d7d9786dafd16d7d461a23dc 100644 (file)
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -109,7 +109,8 @@ mcp_update_shared_key(struct mailbox_transaction_context *t,
        const char *dest_username;
        int ret = 0;
 
-       bool disallow_insecure = mail_crypt_acl_secure_sharing_enabled(user);
+       bool disallow_insecure =
+               mail_user_plugin_getenv_bool(user, MAIL_CRYPT_ACL_SECURE_SHARE_SETTING);
 
        ret = mcp_user_create(user, target_uid, &dest_user,
                              &dest_service_user, &error);

diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
index 71ab1e771fe883bb2b72cc53edba534dfab980a4..945dab724dc1ef6aef7bd16abcc39d6c5707e02a 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -10,6 +10,7 @@
 #include "mail-namespace.h"
 #include "mail-storage-hooks.h"
 #include "mail-storage-service.h"
+#include "mail-user.h"
 #include "acl-plugin.h"
 #include "acl-api-private.h"
 #include "mail-crypt-common.h"
@@ -254,7 +255,8 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
                return -1;
 
        bool disallow_insecure =
-               mail_crypt_acl_secure_sharing_enabled(aclobj->backend->list->ns->user);
+               mail_user_plugin_getenv_bool(aclobj->backend->list->ns->user,
+                                            MAIL_CRYPT_ACL_SECURE_SHARE_SETTING);
 
        const char *box_name = mailbox_list_get_vname(aclobj->backend->list,
                                                      aclobj->name);

diff --git a/src/plugins/mail-crypt/mail-crypt-key.c b/src/plugins/mail-crypt/mail-crypt-key.c
index c5c5c85a2ef97bb0b706955cf78ac788dd302819..bc37ad57e42ca269fbd0d95288890c3e66335b4f 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-key.c
+++ b/src/plugins/mail-crypt/mail-crypt-key.c
@@ -1191,31 +1191,6 @@ mail_crypt_box_get_or_gen_public_key(struct mailbox *box,
        return 0;
 }
 
-bool mail_crypt_acl_secure_sharing_enabled(struct mail_user *user)
-{
-       const char *env =
-               mail_user_plugin_getenv(user, MAIL_CRYPT_ACL_SECURE_SHARE_SETTING);
-
-       /* disabled by default */
-       bool ret = FALSE;
-
-       if (env != NULL) {
-               /* enable unless specifically
-                    requested not to */
-               ret = TRUE;
-               switch (env[0]) {
-                       case 'n':
-                       case 'N':
-                       case '0':
-                       case 'f':
-                       case 'F':
-                       ret = FALSE;
-               }
-       }
-
-       return ret;
-}
-
 static const struct mailbox_attribute_internal mailbox_internal_attributes[] = {
        { .type = MAIL_ATTRIBUTE_TYPE_PRIVATE,
          .key = BOX_CRYPT_PREFIX,

diff --git a/src/plugins/mail-crypt/mail-crypt-key.h b/src/plugins/mail-crypt/mail-crypt-key.h
index f4a724a45addb8818cf602bf2b4f7970ae6a9fb2..55e95e26eba9a3de592feb9473c901b071f585af 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-key.h
+++ b/src/plugins/mail-crypt/mail-crypt-key.h
@@ -113,7 +113,4 @@ int mail_crypt_box_get_pvt_digests(struct mailbox *box, pool_t pool,
                                   ARRAY_TYPE(const_string) *digests,
                                   const char **error_r);
 
-/* is secure sharing enabled */
-bool mail_crypt_acl_secure_sharing_enabled(struct mail_user *user);
-
 #endif