dovecot-2.0: dsync: Fixed creating mailboxes with remote dsync.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/0ece958ef45b
changeset: 11763:0ece958ef45b
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jul 09 13:07:37 2010 +0100
description:
dsync: Fixed creating mailboxes with remote dsync.

diffstat:

 src/dsync/dsync-brain.c |  2 +-
 src/dsync/dsync-proxy.c |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 065ff4f1c504 -r 0ece958ef45b src/dsync/dsync-brain.c
--- a/src/dsync/dsync-brain.c	Fri Jul 09 13:01:52 2010 +0100
+++ b/src/dsync/dsync-brain.c	Fri Jul 09 13:07:37 2010 +0100
@@ -287,7 +287,7 @@
 		break;
 	case DSYNC_BRAIN_MAILBOX_ACTION_CREATE:
 		new_box = *action_box;
-		new_box.uid_next = 0;
+		new_box.uid_next = action_box->uid_validity == 0 ? 0 : 1;
 		new_box.highest_modseq = 0;
 		dsync_worker_create_mailbox(action_worker, &new_box);
 		break;
diff -r 065ff4f1c504 -r 0ece958ef45b src/dsync/dsync-proxy.c
--- a/src/dsync/dsync-proxy.c	Fri Jul 09 13:01:52 2010 +0100
+++ b/src/dsync/dsync-proxy.c	Fri Jul 09 13:07:37 2010 +0100
@@ -170,6 +170,7 @@
 	}
 	i_assert(box->uid_validity != 0 ||
 		 (box->flags & DSYNC_MAILBOX_FLAG_DELETED_MAILBOX) != 0);
+	i_assert(box->uid_validity == 0 || box->uid_next != 0);
 
 	str_append_c(str, '\t');
 	dsync_proxy_mailbox_guid_export(str, &box->mailbox_guid);