From: Timo Sirainen <tss@iki.fi>
Date: Mon, 6 May 2013 12:17:49 +0000 (+0300)
Subject: maildir++: Fixed mail_shared_explicit_inbox=no
X-Git-Tag: 2.2.2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48cfcd33ace8ffc438122e0d02ed3ceb59ca13ee;p=thirdparty%2Fdovecot%2Fcore.git

maildir++: Fixed mail_shared_explicit_inbox=no
---

diff --git a/src/lib-storage/list/mailbox-list-maildir-iter.c b/src/lib-storage/list/mailbox-list-maildir-iter.c
index 6e2df66dcc..30506a0165 100644
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c
+++ b/src/lib-storage/list/mailbox-list-maildir-iter.c
@@ -372,6 +372,7 @@ maildir_fill_readdir(struct maildir_list_iterate_context *ctx,
 	struct mail_namespace *ns = list->ns;
 	DIR *dirp;
 	struct dirent *d;
+	const char *vname;
 	int ret = 0;
 
 	dirp = opendir(ctx->dir);
@@ -409,8 +410,8 @@ maildir_fill_readdir(struct maildir_list_iterate_context *ctx,
 		return maildir_fill_inbox(ctx, glob, "INBOX", update_only);
 	} else if ((ns->flags & NAMESPACE_FLAG_INBOX_ANY) != 0) {
 		/* show shared INBOX. */
-		return maildir_fill_inbox(ctx, glob,
-			t_strconcat(ns->prefix, "INBOX", NULL), update_only);
+		vname = mailbox_list_get_vname(ns->list, "INBOX");
+		return maildir_fill_inbox(ctx, glob, vname, update_only);
 	} else {
 		return 0;
 	}