[dovecot-cvs] dovecot/src/lib-storage/list index-mailbox-list.c, 1.12, 1.13

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/list
In directory talvi:/tmp/cvs-serv24036/lib-storage/list

Modified Files:
	index-mailbox-list.c 
Log Message:
Fixes for INDEX=MEMORY



Index: index-mailbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/index-mailbox-list.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index-mailbox-list.c	17 Apr 2007 10:06:59 -0000	1.12
+++ index-mailbox-list.c	13 May 2007 18:07:05 -0000	1.13
@@ -456,7 +456,8 @@
 	const char *dir;
 
 	/* FIXME: for now we only work with maildir++ */
-	if (getenv("MAILBOX_LIST_INDEX_DISABLE") != NULL ||
+	dir = mailbox_list_get_path(list, NULL, MAILBOX_LIST_PATH_TYPE_INDEX);
+	if (*dir == '\0' || getenv("MAILBOX_LIST_INDEX_DISABLE") != NULL ||
 	    strcmp(list->name, "maildir++") != 0) {
 		/* reserve the module context anyway, so syncing code knows
 		   that the index is disabled */
@@ -473,7 +474,6 @@
 	list->v.iter_next = index_mailbox_list_iter_next;
 	MODULE_CONTEXT_SET(list, index_mailbox_list_module, ilist);
 
-	dir = mailbox_list_get_path(list, NULL, MAILBOX_LIST_PATH_TYPE_INDEX);
 	ilist->mail_index = mail_index_alloc(dir, MAIL_INDEX_PREFIX);
 
 	/* sync_init allocates the extensions. do it here before opening the