lib-storage: mailbox-list-index - disable if MAILBOX_LIST_PROP_NO_LIS…

…T_INDEX set
dovecot · Nov 15, 2017 · dc8dc2e · dc8dc2e
1 parent 18b3f47
commit dc8dc2e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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);