From: Timo Sirainen <tss@iki.fi>
Date: Thu, 27 Aug 2015 15:35:17 +0000 (+0200)
Subject: imapc: Don't crash with mailbox_list_index=yes
X-Git-Tag: 2.2.19.rc1~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1d6887e8cbbdc7c67904d18a15ee0c8ec401ed4;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Don't crash with mailbox_list_index=yes
---

diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c
index 9c4d9a2f77..50d5565098 100644
--- a/src/lib-storage/list/mailbox-list-index.c
+++ b/src/lib-storage/list/mailbox-list-index.c
@@ -12,6 +12,8 @@
 
 #define MAILBOX_LIST_INDEX_REFRESH_DELAY_MSECS 1000
 
+static void mailbox_list_index_init_finish(struct mailbox_list *list);
+
 struct mailbox_list_index_module mailbox_list_index_module =
 	MODULE_CONTEXT_INIT(&mailbox_list_module_register);
 
@@ -656,6 +658,12 @@ static void mailbox_list_index_created(struct mailbox_list *list)
 	v->notify_wait = mailbox_list_index_notify_wait;
 
 	MODULE_CONTEXT_SET(list, mailbox_list_index_module, ilist);
+
+	if ((list->flags & MAILBOX_LIST_FLAG_SECONDARY) != 0) {
+		/* secondary lists aren't accessible via namespaces, so we
+		   need to finish them now. */
+		mailbox_list_index_init_finish(list);
+	}
 }
 
 static void mailbox_list_index_init_finish(struct mailbox_list *list)