dovecot-2.2: dsync: Fixed handling of deleted directories.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/594cd05217eb
changeset: 19339:594cd05217eb
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Oct 29 15:06:16 2015 +0200
description:
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.

diffstat:

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

diffs (13 lines):

diff -r 308af6582495 -r 594cd05217eb src/doveadm/dsync/dsync-mailbox-tree-fill.c
--- 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;
 			}