[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-storage.c, 1.125, 1.126

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv21690

Modified Files:
	mbox-storage.c 
Log Message:
Using MAILBOX_OPEN_NO_INDEX_FILES caused crashes in deinitialization



Index: mbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-storage.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- mbox-storage.c	7 Oct 2005 09:42:35 -0000	1.125
+++ mbox-storage.c	19 Nov 2005 12:35:50 -0000	1.126
@@ -539,12 +539,9 @@
 	}
 
 	if ((flags & MAILBOX_OPEN_NO_INDEX_FILES) != 0)
-		index = mail_index_alloc(NULL, NULL);
-	else {
-		index = index_storage_alloc(index_dir, path,
-					    MBOX_INDEX_PREFIX);
-	}
+		index_dir = NULL;
 
+	index = index_storage_alloc(index_dir, path, MBOX_INDEX_PREFIX);
 	mbox = mbox_alloc(storage, index, name, flags);
 	if (mbox == NULL)
 		return NULL;
@@ -574,19 +571,18 @@
 
 	flags |= MAILBOX_OPEN_READONLY;
 
+	path = mbox_get_path(istorage, name);
 	if ((flags & MAILBOX_OPEN_NO_INDEX_FILES) != 0)
-		index = mail_index_alloc(NULL, NULL);
+		index_dir = NULL;
 	else {
-		path = mbox_get_path(istorage, name);
 		index_dir = mbox_get_index_dir(istorage, name);
 
 		/* make sure the required directories are also there */
 		if (create_mbox_index_dirs(istorage, name) < 0)
 			return NULL;
-
-		index = index_storage_alloc(index_dir, path, MBOX_INDEX_PREFIX);
 	}
 
+	index = index_storage_alloc(index_dir, path, MBOX_INDEX_PREFIX);
 	mbox = mbox_alloc(storage, index, name, flags);
 	if (mbox == NULL)
 		return NULL;