From: Timo Sirainen <tss@iki.fi>
Date: Thu, 29 Oct 2015 13:06:16 +0000 (+0200)
Subject: dsync: Fixed handling of deleted directories.
X-Git-Tag: 2.2.20.rc1~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b945a474088d82a552694e6af3802dc84382f2d;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Fixed handling of deleted directories.
We may still know about the directory node even if it doesn't exist, and we
still want to delete it.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-tree-fill.c b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
index 47e3f08983..895d1c608c 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
@@ -177,7 +177,8 @@ dsync_mailbox_tree_add_change_timestamps(struct dsync_mailbox_tree *tree,
 			memcpy(del->guid, rec->mailbox_guid, sizeof(del->guid));
 			break;
 		case MAILBOX_LOG_RECORD_DELETE_DIR:
-			if (node != NULL) {
+			if (node != NULL &&
+			    node->existence == DSYNC_MAILBOX_NODE_EXISTS) {
 				/* directory exists again, skip it */
 				break;
 			}