dovecot-2.2: mdbox: Fixed assert-crash with index rebuild when u...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/969950d53af1
changeset: 14640:969950d53af1
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 29 20:51:14 2012 +0300
description:
mdbox: Fixed assert-crash with index rebuild when using ns prefix and mail wasn't originally in INBOX.

diffstat:

 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r fe688ecd7564 -r 969950d53af1 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Tue May 29 18:38:01 2012 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Tue May 29 20:51:14 2012 +0300
@@ -605,6 +605,7 @@
 	if (ret > 0 && !deleted && dbox_file_metadata_read(file) > 0) {
 		mailbox = dbox_file_metadata_get(file,
 						 DBOX_METADATA_ORIG_MAILBOX);
+		mailbox = mailbox_list_get_vname(ctx->default_list, mailbox);
 		mailbox = t_strdup(mailbox);
 	}
 	dbox_file_unref(&file);
@@ -623,7 +624,7 @@
 	   there. */
 	created = FALSE;
 	box = ctx->prev_msg.box != NULL &&
-		strcmp(mailbox, ctx->prev_msg.box->name) == 0 ?
+		strcmp(mailbox, ctx->prev_msg.box->vname) == 0 ?
 		ctx->prev_msg.box : NULL;
 	while (box == NULL) {
 		box = mailbox_alloc(ctx->default_list, mailbox,