From: Timo Sirainen <tss@iki.fi>
Date: Fri, 11 Feb 2011 22:38:09 +0000 (+0200)
Subject: lib-storage: Mailbox list indexes are now enabled also for in-memory indexes.
X-Git-Tag: 2.1.alpha1~351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c563c72e16577fa0d69bfd92c94a2c7b4e076b91;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Mailbox list indexes are now enabled also for in-memory indexes.
---

diff --git a/src/lib-storage/list/index-mailbox-list.c b/src/lib-storage/list/index-mailbox-list.c
index c9648185ce..cecc9f96e7 100644
--- a/src/lib-storage/list/index-mailbox-list.c
+++ b/src/lib-storage/list/index-mailbox-list.c
@@ -799,13 +799,15 @@ static void index_mailbox_list_created(struct mailbox_list *list)
 	const char *dir;
 
 	dir = mailbox_list_get_path(list, NULL, MAILBOX_LIST_PATH_TYPE_INDEX);
-	if (*dir == '\0' || list->mail_set->mailbox_list_index) {
+	if (list->mail_set->mailbox_list_index) {
 		/* reserve the module context anyway, so syncing code knows
 		   that the index is disabled */
 		ilist = NULL;
 		MODULE_CONTEXT_SET(list, index_mailbox_list_module, ilist);
 		return;
 	}
+	if (*dir == '\0')
+		dir = NULL;
 
 	ilist = p_new(list->pool, struct index_mailbox_list, 1);
 	ilist->module_ctx.super = list->v;
@@ -822,8 +824,8 @@ static void index_mailbox_list_created(struct mailbox_list *list)
 
 	MODULE_CONTEXT_SET(list, index_mailbox_list_module, ilist);
 
-	ilist->path = p_strdup_printf(list->pool,
-				      "%s/"MAILBOX_LIST_INDEX_PREFIX, dir);
+	ilist->path = dir == NULL ? "(in-memory mailbox list index)" :
+		p_strdup_printf(list->pool, "%s/"MAILBOX_LIST_INDEX_PREFIX, dir);
 	ilist->index = mail_index_alloc(dir, MAILBOX_LIST_INDEX_PREFIX);
 
 	ilist->ext_id = mail_index_ext_register(ilist->index, "list",