dovecot-2.2: mbox: If GUID lookup fails because mbox_min_index_s...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Jul 3 19:25:35 UTC 2014
details: http://hg.dovecot.org/dovecot-2.2/rev/0343869d47cf
changeset: 17594:0343869d47cf
user: Timo Sirainen <tss at iki.fi>
date: Thu Jul 03 22:24:05 2014 +0300
description:
mbox: If GUID lookup fails because mbox_min_index_size skipped indexes, say so in error message.
diffstat:
src/lib-storage/index/mbox/mbox-storage.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diffs (22 lines):
diff -r 40dc5774aa69 -r 0343869d47cf src/lib-storage/index/mbox/mbox-storage.c
--- a/src/lib-storage/index/mbox/mbox-storage.c Thu Jul 03 22:17:49 2014 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.c Thu Jul 03 22:24:05 2014 +0300
@@ -618,9 +618,16 @@
static int
mbox_mailbox_get_guid(struct mbox_mailbox *mbox, guid_128_t guid_r)
{
+ const char *errstr;
+
if (mail_index_is_in_memory(mbox->box.index)) {
- mail_storage_set_error(mbox->box.storage, MAIL_ERROR_NOTPOSSIBLE,
- "Mailbox GUIDs are not permanent without index files");
+ errstr = "Mailbox GUIDs are not permanent without index files";
+ if (mbox->storage->set->mbox_min_index_size != 0) {
+ errstr = t_strconcat(errstr,
+ " (mbox_min_index_size is non-zero)", NULL);
+ }
+ mail_storage_set_error(mbox->box.storage,
+ MAIL_ERROR_NOTPOSSIBLE, errstr);
return -1;
}
if (mbox_sync_header_refresh(mbox) < 0)
More information about the dovecot-cvs
mailing list