From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 16 Feb 2018 14:03:46 +0000 (+0200)
Subject: doveadm sync/backup: Don't override BROKENCHAR if it's already set
X-Git-Tag: 2.2.35~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec5d2e1653c52984e0ad02596be628ed9c68c38e;p=thirdparty%2Fdovecot%2Fcore.git

doveadm sync/backup: Don't override BROKENCHAR if it's already set

This allows migrating invalid mailbox names by specifying BROKENCHAR.
Previously it would always try to use \003 control character, which isn't
valid character in mailbox names so the mailbox creation would fail.
---

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 65ec0b0a40..8226a71989 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -323,8 +323,10 @@ static void doveadm_user_init_dsync(struct mail_user *user)
 	struct mail_namespace *ns;
 
 	user->dsyncing = TRUE;
-	for (ns = user->namespaces; ns != NULL; ns = ns->next)
-		ns->list->set.broken_char = DSYNC_LIST_BROKEN_CHAR;
+	for (ns = user->namespaces; ns != NULL; ns = ns->next) {
+		if (ns->list->set.broken_char == '\0')
+			ns->list->set.broken_char = DSYNC_LIST_BROKEN_CHAR;
+	}
 }
 
 static bool paths_are_equal(struct mail_user *user1, struct mail_user *user2,