From: Timo Sirainen <tss@iki.fi>
Date: Thu, 3 Jul 2014 19:24:05 +0000 (+0300)
Subject: mbox: If GUID lookup fails because mbox_min_index_size skipped indexes, say so in... 
X-Git-Tag: 2.2.14.rc1~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99e11aeca27872b65ff3ed654f6873d10dd8f3d8;p=thirdparty%2Fdovecot%2Fcore.git

mbox: If GUID lookup fails because mbox_min_index_size skipped indexes, say so in error message.
---

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 46b604952a..3774da526f 100644
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -618,9 +618,16 @@ static void mbox_mailbox_close(struct mailbox *box)
 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)