From: Timo Sirainen <tss@iki.fi>
Date: Sun, 6 Dec 2015 14:09:55 +0000 (+0200)
Subject: lib-storage: dovecot.index.pvt* ignored several settings.
X-Git-Tag: 2.2.20~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8abe00d5cd79eea426b621fe2ef0120ef11f0eda;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: dovecot.index.pvt* ignored several settings.
mmap_disable=yes, dotlock_use_excl=yes and nfs_flush_index=yes weren't used.
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 75c05a28b3..fe319755e2 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1174,6 +1174,7 @@ static int mailbox_alloc_index_pvt(struct mailbox *box)
 
 int mailbox_open_index_pvt(struct mailbox *box)
 {
+	enum mail_index_open_flags index_flags;
 	int ret;
 
 	if (box->view_pvt != NULL)
@@ -1183,7 +1184,11 @@ int mailbox_open_index_pvt(struct mailbox *box)
 
 	if ((ret = mailbox_alloc_index_pvt(box)) <= 0)
 		return ret;
-	if (mail_index_open(box->index_pvt, MAIL_INDEX_OPEN_FLAG_CREATE) < 0)
+	index_flags = MAIL_INDEX_OPEN_FLAG_CREATE |
+		mail_storage_settings_to_index_flags(box->storage->set);
+	if ((box->flags & MAILBOX_FLAG_SAVEONLY) != 0)
+		index_flags |= MAIL_INDEX_OPEN_FLAG_SAVEONLY;
+	if (mail_index_open(box->index_pvt, index_flags) < 0)
 		return -1;
 	box->view_pvt = mail_index_view_open(box->index_pvt);
 	return 1;