From: Timo Sirainen Date: Mon, 3 Feb 2014 16:50:49 +0000 (-0500) Subject: doveadm backup: Fixed assert-crash when syncing mailbox deletion. X-Git-Tag: 2.2.11~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea7f72aa97f0f3c2e181ab3ae432f2e22148f3b;p=thirdparty%2Fdovecot%2Fcore.git doveadm backup: Fixed assert-crash when syncing mailbox deletion. --- diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c index 552b9af466..581f41fac3 100644 --- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c +++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c @@ -1217,9 +1217,9 @@ dsync_mailbox_trees_sync_init(struct dsync_mailbox_tree *local_tree, ctx->sync_flags = sync_flags; i_array_init(&ctx->changes, 128); - ignore_deletes = sync_type == DSYNC_MAILBOX_TREES_SYNC_TYPE_PRESERVE_LOCAL; - sync_tree_sort_and_delete_mailboxes(ctx, remote_tree, ignore_deletes); ignore_deletes = sync_type == DSYNC_MAILBOX_TREES_SYNC_TYPE_PRESERVE_REMOTE; + sync_tree_sort_and_delete_mailboxes(ctx, remote_tree, ignore_deletes); + ignore_deletes = sync_type == DSYNC_MAILBOX_TREES_SYNC_TYPE_PRESERVE_LOCAL; sync_tree_sort_and_delete_mailboxes(ctx, local_tree, ignore_deletes); dsync_mailbox_tree_update_child_timestamps(&local_tree->root, 0);