dovecot-2.1: imap LIST: Don't set \haschildren flag for namespac...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/68a62d79b1b4
changeset: 14664:68a62d79b1b4
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Aug 14 01:54:34 2012 +0300
description:
imap LIST: Don't set \haschildren flag for namespace prefix if it has list=no

diffstat:

 src/imap/cmd-list.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 963482677c0b -r 68a62d79b1b4 src/imap/cmd-list.c
--- a/src/imap/cmd-list.c	Mon Aug 13 07:26:25 2012 +0300
+++ b/src/imap/cmd-list.c	Tue Aug 14 01:54:34 2012 +0300
@@ -456,10 +456,12 @@
 		if (ctx->cur_ns_send_prefix)
 			list_namespace_send_prefix(ctx, TRUE);
 
-		/* if there's a namespace with this name, list it as
+		/* if there's a list=yes namespace with this name, list it as
 		   having children */
 		ns = mail_namespace_find_prefix_nosep(ctx->ns, name);
-		if (ns != NULL) {
+		if (ns != NULL &&
+		    (ns->flags & (NAMESPACE_FLAG_LIST_PREFIX |
+				  NAMESPACE_FLAG_LIST_CHILDREN)) != 0) {
 			flags |= MAILBOX_CHILDREN;
 			flags &= ~MAILBOX_NOCHILDREN;
 			array_append(&ctx->ns_prefixes_listed, &ns, 1);