From ff3c528e094e75e3c6bc11af75ef84484d963ae9 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 16 Nov 2008 15:02:57 +0200 Subject: [PATCH] IGNORE_ACLS should have been mailbox_open_flags, not mail_storage_flag. --HG-- branch : HEAD --- src/lib-storage/mail-storage.h | 8 ++++---- src/plugins/acl/acl-storage.c | 2 +- src/plugins/imap-acl/imap-acl-plugin.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h index 5502c084e5..21cedd44cd 100644 --- a/src/lib-storage/mail-storage.h +++ b/src/lib-storage/mail-storage.h @@ -39,9 +39,7 @@ enum mail_storage_flags { MAIL_STORAGE_FLAG_NFS_FLUSH_STORAGE = 0x800, MAIL_STORAGE_FLAG_NFS_FLUSH_INDEX = 0x1000, /* Don't use fsync() or fdatasync() */ - MAIL_STORAGE_FLAG_FSYNC_DISABLE = 0x2000, - /* Force opening mailbox and ignoring any ACLs */ - MAIL_STORAGE_FLAG_IGNORE_ACLS = 0x4000 + MAIL_STORAGE_FLAG_FSYNC_DISABLE = 0x2000 }; enum mailbox_open_flags { @@ -60,7 +58,9 @@ enum mailbox_open_flags { MAILBOX_OPEN_KEEP_LOCKED = 0x20, /* Enable if mailbox is used for serving POP3. This allows making better caching decisions. */ - MAILBOX_OPEN_POP3_SESSION = 0x40 + MAILBOX_OPEN_POP3_SESSION = 0x40, + /* Force opening mailbox and ignoring any ACLs */ + MAILBOX_OPEN_IGNORE_ACLS = 0x80 }; enum mailbox_feature { diff --git a/src/plugins/acl/acl-storage.c b/src/plugins/acl/acl-storage.c index bc8fe167c5..2474535ab6 100644 --- a/src/plugins/acl/acl-storage.c +++ b/src/plugins/acl/acl-storage.c @@ -99,7 +99,7 @@ acl_mailbox_open(struct mail_storage *storage, const char *name, int ret; /* mailbox can be opened either for reading or appending new messages */ - if ((flags & MAIL_STORAGE_FLAG_IGNORE_ACLS) != 0) { + if ((flags & MAILBOX_OPEN_IGNORE_ACLS) != 0) { ret = 1; } else if ((flags & MAILBOX_OPEN_SAVEONLY) != 0) { ret = acl_storage_have_right(storage, name, diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c index 101b16abff..6dc4b261b6 100644 --- a/src/plugins/imap-acl/imap-acl-plugin.c +++ b/src/plugins/imap-acl/imap-acl-plugin.c @@ -61,7 +61,7 @@ acl_mailbox_open_as_admin(struct client_command_context *cmd, const char *name) /* Force opening the mailbox so that we can give a nicer error message if mailbox isn't selectable but is listable. */ box = mailbox_open(storage, name, NULL, ACL_MAILBOX_OPEN_FLAGS | - MAIL_STORAGE_FLAG_IGNORE_ACLS); + MAILBOX_OPEN_IGNORE_ACLS); if (box == NULL) { client_send_storage_error(cmd, storage); return NULL; @@ -232,7 +232,7 @@ static bool cmd_myrights(struct client_command_context *cmd) return TRUE; box = mailbox_open(storage, real_mailbox, NULL, ACL_MAILBOX_OPEN_FLAGS | - MAIL_STORAGE_FLAG_IGNORE_ACLS); + MAILBOX_OPEN_IGNORE_ACLS); if (box == NULL) { client_send_storage_error(cmd, storage); return TRUE; -- 2.47.3