[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-list.c, 1.29, 1.30

[cras at dovecot.org]

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

Modified Files:
	mbox-list.c 
Log Message:
Give error message if mailbox listing fails. Don't crash with mbox if
.subscriptions file couldn't be opened.



Index: mbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-list.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mbox-list.c	29 Dec 2004 19:10:27 -0000	1.29
+++ mbox-list.c	21 Jul 2005 19:16:31 -0000	1.30
@@ -144,6 +144,7 @@
 			subsfile_list_init(storage, path);
 		if (ctx->subsfile_ctx == NULL) {
 			ctx->next = mbox_list_next;
+			ctx->failed = TRUE;
 			return &ctx->mailbox_ctx;
 		}
 		ctx->glob = imap_match_init(default_pool, mask, TRUE, '/');
@@ -423,7 +424,7 @@
 	}
 
 	if (!ctx->inbox_found && (ctx->flags & MAILBOX_LIST_INBOX) != 0 &&
-	    imap_match(ctx->glob, "INBOX")  > 0) {
+	    ctx->glob != NULL && imap_match(ctx->glob, "INBOX")  > 0) {
 		/* show inbox */
 		ctx->inbox_found = TRUE;
 		return mbox_list_inbox(ctx);