[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-list.c, 1.27, 1.28

[cras at dovecot.org]

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

Modified Files:
	mbox-list.c 
Log Message:
Added MAILBOX_LIST_INBOX flag. Do the special cased INBOX handling only if
it's set.



Index: mbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-list.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mbox-list.c	11 Sep 2004 10:23:40 -0000	1.27
+++ mbox-list.c	11 Sep 2004 10:28:51 -0000	1.28
@@ -260,7 +260,8 @@
 	}
 
 	/* make sure we give only one correct INBOX */
-	if (strcasecmp(list_path, "INBOX") == 0) {
+	if (strcasecmp(list_path, "INBOX") == 0 &&
+	    (ctx->flags & MAILBOX_LIST_INBOX) != 0) {
 		if (ctx->inbox_found ||
 		    strcmp(real_path, ctx->istorage->inbox_path) != 0)
 			return 0;
@@ -421,7 +422,8 @@
 		list_dir_context_free(dir);
 	}
 
-	if (!ctx->inbox_found && imap_match(ctx->glob, "INBOX")  > 0) {
+	if (!ctx->inbox_found && (ctx->flags & MAILBOX_LIST_INBOX) != 0 &&
+	    imap_match(ctx->glob, "INBOX")  > 0) {
 		/* show inbox */
 		ctx->inbox_found = TRUE;
 		return mbox_list_inbox(ctx);