From: Timo Sirainen <tss@iki.fi>
Date: Wed, 19 May 2010 15:35:27 +0000 (+0200)
Subject: lib-storage: mailbox_list_iter_init_namespaces() didn't match INBOX pattern correctly.
X-Git-Tag: 2.0.beta6~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b8bcce7a001076605cb2cfdca8507204c88f376;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mailbox_list_iter_init_namespaces() didn't match INBOX pattern correctly.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index d9e5520c3e..47e2ea253e 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -606,6 +606,19 @@ ns_match_simple(struct ns_list_iterate_context *ctx, struct mail_namespace *ns)
 	return TRUE;
 }
 
+static bool
+ns_match_inbox(struct mail_namespace *ns, const char *pattern)
+{
+	struct imap_match_glob *glob;
+
+	if ((ns->flags & NAMESPACE_FLAG_INBOX) == 0)
+		return FALSE;
+
+	glob = imap_match_init(pool_datastack_create(), pattern,
+			       TRUE, ns->sep);
+	return imap_match(glob, "INBOX") == IMAP_MATCH_YES;
+}
+
 static bool
 ns_match_next(struct ns_list_iterate_context *ctx, struct mail_namespace *ns,
 	      const char *pattern)
@@ -693,6 +706,8 @@ ns_match(struct ns_list_iterate_context *ctx, struct mail_namespace *ns)
 		   necessary, but this shouldn't matter much */
 		T_BEGIN {
 			for (i = 0; ctx->patterns_ns_match[i] != NULL; i++) {
+				if (ns_match_inbox(ns, ctx->patterns_ns_match[i]))
+					break;
 				if (ns_match_next(ctx, ns,
 						  ctx->patterns_ns_match[i]))
 					break;