[dovecot-cvs] dovecot/src/imap cmd-list.c,1.51.2.5,1.51.2.6

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv12852

Modified Files:
      Tag: branch_1_0
	cmd-list.c 
Log Message:
If namespace has a prefix and inbox=no, don't list prefix.inbox if it
happens to exist when listing for %.



Index: cmd-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-list.c,v
retrieving revision 1.51.2.5
retrieving revision 1.51.2.6
diff -u -d -r1.51.2.5 -r1.51.2.6
--- cmd-list.c	2 Nov 2006 20:42:24 -0000	1.51.2.5
+++ cmd-list.c	5 Feb 2007 14:15:53 -0000	1.51.2.6
@@ -272,7 +272,8 @@
 	inbox_glob = imap_match_init(cmd->pool,
 				     t_strconcat(ctx->ref, ctx->mask, NULL),
 				     TRUE, ns->sep);
-	inbox_match = imap_match(inbox_glob, "INBOX");
+	inbox_match = *ns->prefix == '\0' || ns->inbox ?
+		imap_match(inbox_glob, "INBOX") : FALSE;
 	ctx->match_inbox = inbox_match == IMAP_MATCH_YES;
 
 	ctx->glob = imap_match_init(cmd->pool, ctx->mask,
@@ -381,7 +382,7 @@
 	cur_mask = namespace_fix_sep(ns, cur_mask);
 
 	list_flags = ctx->list_flags;
-	if ((*ns->prefix == '\0' || ns->inbox) && ctx->match_inbox)
+	if (ctx->match_inbox)
 		list_flags |= MAILBOX_LIST_INBOX;
 	ctx->list_ctx = mail_storage_mailbox_list_init(ns->storage,
 						       cur_ref, cur_mask,