From 89e94dc8041c66a40509aae1147a58ddf4fdbb48 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 4 Apr 2013 23:03:47 +0300 Subject: [PATCH] dsync: Mailbox name fixing didn't work when namespace prefixes were used. --- src/doveadm/dsync/dsync-brain-mailbox-tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree.c b/src/doveadm/dsync/dsync-brain-mailbox-tree.c index a049aee81b..6d26a98975 100644 --- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c +++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c @@ -245,13 +245,14 @@ dsync_fix_mailbox_name(struct mail_namespace *ns, string_t *vname, return; } /* 3) probably some reserved name (e.g. dbox-Mails) */ - str_insert(vname, 0, "_"); + str_insert(vname, ns->prefix_len, "_"); if (dsync_is_valid_name(ns, str_c(vname))) return; /* 4) name is too long? just give up and generate a unique name */ guid_128_generate(guid); str_truncate(vname, 0); + str_append(vname, ns->prefix); str_append(vname, guid_128_to_string(guid)); i_assert(dsync_is_valid_name(ns, str_c(vname))); } -- 2.47.3