dovecot-2.2: doveadm backup: Fixed assert-crash when syncing mai...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/fbc8fe46dfce
changeset: 17127:fbc8fe46dfce
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 03 11:50:49 2014 -0500
description:
doveadm backup: Fixed assert-crash when syncing mailbox deletion.

diffstat:

 src/doveadm/dsync/dsync-mailbox-tree-sync.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r e5e7579e30f0 -r fbc8fe46dfce src/doveadm/dsync/dsync-mailbox-tree-sync.c
--- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c	Mon Feb 03 11:50:10 2014 -0500
+++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c	Mon Feb 03 11:50:49 2014 -0500
@@ -1217,9 +1217,9 @@
 	ctx->sync_flags = sync_flags;
 	i_array_init(&ctx->changes, 128);
 
+	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, remote_tree, ignore_deletes);
-	ignore_deletes = sync_type == DSYNC_MAILBOX_TREES_SYNC_TYPE_PRESERVE_REMOTE;
 	sync_tree_sort_and_delete_mailboxes(ctx, local_tree, ignore_deletes);
 
 	dsync_mailbox_tree_update_child_timestamps(&local_tree->root, 0);