]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dsync: Avoid assert-crashing when trying to create a reserved mailbox name (e.g....
authorTimo Sirainen <tss@iki.fi>
Thu, 23 Sep 2010 15:40:42 +0000 (16:40 +0100)
committerTimo Sirainen <tss@iki.fi>
Thu, 23 Sep 2010 15:40:42 +0000 (16:40 +0100)
src/dsync/dsync-worker-local.c

index 3a39d4fe057521fd8f7e50cf4dc7b1458f936403..a4fafbed25b9d69f4da1d733ced73cc7e370a3b1 100644 (file)
@@ -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;
 }