Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8427:47198d7a5f03 HEAD
IGNORE_ACLS should have been mailbox_open_flags, not mail_storage_flag.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 16 Nov 2008 15:02:57 +0200 |
| parents | 5c4af90c9155 |
| children | 1b7c0a216663 |
| files | src/lib-storage/mail-storage.h src/plugins/acl/acl-storage.c src/plugins/imap-acl/imap-acl-plugin.c |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-storage.h Sun Nov 16 14:43:14 2008 +0200 +++ b/src/lib-storage/mail-storage.h Sun Nov 16 15:02:57 2008 +0200 @@ -39,9 +39,7 @@ 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 @@ 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 {
--- a/src/plugins/acl/acl-storage.c Sun Nov 16 14:43:14 2008 +0200 +++ b/src/plugins/acl/acl-storage.c Sun Nov 16 15:02:57 2008 +0200 @@ -99,7 +99,7 @@ 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,
--- a/src/plugins/imap-acl/imap-acl-plugin.c Sun Nov 16 14:43:14 2008 +0200 +++ b/src/plugins/imap-acl/imap-acl-plugin.c Sun Nov 16 15:02:57 2008 +0200 @@ -61,7 +61,7 @@ /* 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 @@ 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;