]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dsync: Fixed assert-crash if mailbox_attribute_set() fails
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 3 May 2016 19:18:54 +0000 (22:18 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 3 May 2016 19:18:54 +0000 (22:18 +0300)
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))

src/doveadm/dsync/dsync-mailbox-import.c

index f561787dfb78578af49b129d7ae2b17f38008872..3392a6534924df752c9f5438ba760de67aa67ca9 100644 (file)
@@ -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. */
        }