From: Timo Sirainen <tss@iki.fi>
Date: Thu, 23 Sep 2010 15:40:42 +0000 (+0100)
Subject: dsync: Avoid assert-crashing when trying to create a reserved mailbox name (e.g.... 
X-Git-Tag: 2.0.4~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf4b066bf929b7429cdc90e5f5e174b9b7179145;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Avoid assert-crashing when trying to create a reserved mailbox name (e.g. dbox-Mails)
---

diff --git a/src/dsync/dsync-worker-local.c b/src/dsync/dsync-worker-local.c
index 3a39d4fe05..a4fafbed25 100644
--- a/src/dsync/dsync-worker-local.c
+++ b/src/dsync/dsync-worker-local.c
@@ -1097,6 +1097,11 @@ local_worker_convert_mailbox_name(struct local_dsync_worker *worker,
 			name = mailbox_name_force_cleanup(name,
 							  worker->alt_char);
 		}
+		if (!mailbox_list_is_valid_create_name(ns->list, name)) {
+			/* probably some reserved name (e.g. dbox-Mails) */
+			name = t_strconcat("_", name, NULL);
+		}
+		i_assert(mailbox_list_is_valid_create_name(ns->list, name));
 	}
 	return name;
 }