From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 3 May 2016 19:18:54 +0000 (+0300)
Subject: dsync: Fixed assert-crash if mailbox_attribute_set() fails
X-Git-Tag: 2.3.0.rc1~3841
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d02ce5bfbbcea1b532ce9fce78c1f23baea38ca;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Fixed assert-crash if mailbox_attribute_set() fails

We shouldn't set importer->mail_error, because we're not going to
fail the import.

Fixes assert-crash:
dsync-mailbox-import.c: line 2812 (dsync_mailbox_import_deinit): assertion failed: (importer->failed == (importer->mail_error != 0))
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index f561787dfb..3392a65349 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -523,7 +523,7 @@ dsync_mailbox_import_attribute_real(struct dsync_mailbox_importer *importer,
 				  attr->key, &value) < 0) {
 		i_error("Mailbox %s: Failed to set attribute %s: %s",
 			mailbox_get_vname(importer->box), attr->key,
-			mailbox_get_last_error(importer->box, &importer->mail_error));
+			mailbox_get_last_error(importer->box, NULL));
 		/* the attributes aren't vital, don't fail everything just
 		   because of them. */
 	}