Skip to content
Snippets Groups Projects
Commit f7c37a6b authored by Stephan Bosch's avatar Stephan Bosch
Browse files

Matched changes in Dovecot to properly handle/ignore the new mailbox ACL support.

parent 913e9f17
No related branches found
No related tags found
No related merge requests found
......@@ -168,10 +168,18 @@ static void act_store_get_storage_error
static struct mailbox *act_store_mailbox_open
(const struct sieve_action_exec_env *aenv, struct mail_namespace *ns, const char *folder)
{
enum mailbox_open_flags open_flags =
MAILBOX_OPEN_FAST | MAILBOX_OPEN_KEEP_RECENT |
MAILBOX_OPEN_SAVEONLY | MAILBOX_OPEN_POST_SESSION;
struct mailbox *box;
if (strcasecmp(name, "INBOX") == 0) {
/* Deliveries to INBOX must always succeed, regardless of ACLs */
open_flags |= MAILBOX_OPEN_IGNORE_ACLS;
}
box = mailbox_open
(ns->storage, folder, NULL, MAILBOX_OPEN_FAST |MAILBOX_OPEN_KEEP_RECENT);
(ns->storage, folder, NULL, open_flags);
if ( box == NULL && aenv->scriptenv->mailbox_autocreate ) {
enum mail_error error;
......@@ -191,7 +199,7 @@ static struct mailbox *act_store_mailbox_open
/* Try opening again */
box = mailbox_open
(ns->storage, folder, NULL, MAILBOX_OPEN_FAST | MAILBOX_OPEN_KEEP_RECENT);
(ns->storage, folder, NULL, open_flags);
if (box == NULL)
return NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.