From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 15 Nov 2017 07:22:34 +0000 (+0200)
Subject: lib-storage: mailbox-list-index - disable if MAILBOX_LIST_PROP_NO_LIST_INDEX set
X-Git-Tag: 2.3.0.rc1~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc8dc2ec4f92cfc9473c10e2fcc713f475ccee58;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mailbox-list-index - disable if MAILBOX_LIST_PROP_NO_LIST_INDEX set
---

diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c
index 6406d3b7cb..34ebbf235e 100644
--- a/src/lib-storage/list/mailbox-list-index.c
+++ b/src/lib-storage/list/mailbox-list-index.c
@@ -819,9 +819,8 @@ mailbox_list_index_set_subscribed(struct mailbox_list *_list,
 
 static bool mailbox_list_index_is_enabled(struct mailbox_list *list)
 {
-	if (!list->mail_set->mailbox_list_index)
-		return FALSE;
-	if (strcmp(list->name, MAILBOX_LIST_NAME_NONE) == 0)
+	if (!list->mail_set->mailbox_list_index ||
+	    (list->props & MAILBOX_LIST_PROP_NO_LIST_INDEX) != 0)
 		return FALSE;
 
 	i_assert(list->set.list_index_fname != NULL);