dovecot-2.2: dsync: Fixed unsubscribing from mailbox within same...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/33efc5396e44
changeset: 16388:33efc5396e44
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 22 15:16:22 2013 +0300
description:
dsync: Fixed unsubscribing from mailbox within same session as the mailbox's deletion.

diffstat:

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

diffs (14 lines):

diff -r 3984f384257e -r 33efc5396e44 src/doveadm/dsync/dsync-brain-mailbox-tree.c
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c	Wed May 22 14:56:41 2013 +0300
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c	Wed May 22 15:16:22 2013 +0300
@@ -395,8 +395,8 @@
 	name = dsync_mailbox_node_get_full_name(tree, node);
 	other_node = dsync_mailbox_tree_get(other_tree, name);
 
-	if (!guid_128_is_empty(other_node->mailbox_guid) ||
-	    (other_node->existence == DSYNC_MAILBOX_NODE_EXISTS &&
+	if (other_node->existence == DSYNC_MAILBOX_NODE_EXISTS &&
+	    (!guid_128_is_empty(other_node->mailbox_guid) ||
 	     other_del->type != DSYNC_MAILBOX_DELETE_TYPE_MAILBOX)) {
 		/* other side has already created a new mailbox or
 		   directory with this name, we can't delete it */