changeset 19339:594cd05217eb

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.
author Timo Sirainen <tss@iki.fi>
date Thu, 29 Oct 2015 15:06:16 +0200
parents 308af6582495
children 787cfed25b0f
files src/doveadm/dsync/dsync-mailbox-tree-fill.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c	Thu Oct 29 14:09:52 2015 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c	Thu Oct 29 15:06:16 2015 +0200
@@ -177,7 +177,8 @@
 			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;
 			}