From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sat, 17 Feb 2018 21:19:29 +0000 (+0200)
Subject: mbox: Default INBOX=<root path>/inbox only with LAYOUT=fs
X-Git-Tag: 2.3.9~2201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c85316993ddcdaf55a5dec74013a7dc05b795d5a;p=thirdparty%2Fdovecot%2Fcore.git

mbox: Default INBOX=<root path>/inbox only with LAYOUT=fs

It's likely not a valid path with other layouts.
---

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 2a9ab4de2a..b8c85ae402 100644
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -183,7 +183,8 @@ static void mbox_storage_get_list_settings(const struct mail_namespace *ns,
 	if (set->subscription_fname == NULL)
 		set->subscription_fname = MBOX_SUBSCRIPTION_FILE_NAME;
 
-	if (set->inbox_path == NULL) {
+	if (set->inbox_path == NULL &&
+	    strcasecmp(set->layout, MAILBOX_LIST_NAME_FS) == 0) {
 		set->inbox_path = t_strconcat(set->root_dir, "/inbox", NULL);
 		if (ns->mail_set->mail_debug)
 			i_debug("mbox: INBOX defaulted to %s", set->inbox_path);