From: Timo Sirainen Date: Fri, 10 Jul 2009 02:09:57 +0000 (-0400) Subject: convert plugin: Fixed changing hierarchy separators in mailbox names when alt_hierarc... X-Git-Tag: 2.0.alpha1~448 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9bd5d26de2d2256d50a51dda308e9d121ef7113;p=thirdparty%2Fdovecot%2Fcore.git convert plugin: Fixed changing hierarchy separators in mailbox names when alt_hierarchy_char isn't set. --HG-- branch : HEAD --- diff --git a/src/plugins/convert/convert-storage.c b/src/plugins/convert/convert-storage.c index c2abc4b3aa..4973073541 100644 --- a/src/plugins/convert/convert-storage.c +++ b/src/plugins/convert/convert-storage.c @@ -110,12 +110,12 @@ mailbox_name_convert(struct mail_namespace *dest_ns, src_sep = mailbox_list_get_hierarchy_sep(source_ns->list); dest_sep = mailbox_list_get_hierarchy_sep(dest_ns->list); - if (src_sep == dest_sep || set->alt_hierarchy_char == '\0') + if (src_sep == dest_sep) return name; dest_name = t_strdup_noconst(name); for (p = dest_name; *p != '\0'; p++) { - if (*p == dest_sep) + if (*p == dest_sep && set->alt_hierarchy_char != '\0') *p = set->alt_hierarchy_char; else if (*p == src_sep) *p = dest_sep;