From: Timo Sirainen Date: Mon, 20 Feb 2017 17:34:25 +0000 (+0200) Subject: lib-storage, pop3-migration: Reset lookup_abort before continuing to search X-Git-Tag: 2.2.29.rc1~259 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=228a8ba8a03d5d74f4697611b101ea505effcc27;p=thirdparty%2Fdovecot%2Fcore.git lib-storage, pop3-migration: Reset lookup_abort before continuing to search This doesn't really fix anything right now, but it'll allow adding the asserts in the following commit. --- diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c index c365954b65..7e4e0c5a5a 100644 --- a/src/lib-storage/index/index-mailbox-size.c +++ b/src/lib-storage/index/index-mailbox-size.c @@ -330,6 +330,8 @@ index_mailbox_vsize_hdr_add_missing(struct mailbox_vsize_update *update, mail->lookup_abort = MAIL_LOOKUP_ABORT_NOT_IN_CACHE; } ret = mail_get_virtual_size(mail, &vsize); + mail->lookup_abort = MAIL_LOOKUP_ABORT_NEVER; + if (ret < 0 && mailbox_get_last_mail_error(update->box) == MAIL_ERROR_LOOKUP_ABORTED) { /* abort and finish on background */ diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c index 87add47001..34bc85f065 100644 --- a/src/plugins/pop3-migration/pop3-migration-plugin.c +++ b/src/plugins/pop3-migration/pop3-migration-plugin.c @@ -367,6 +367,8 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box) ret = -1; break; } + mail->lookup_abort = MAIL_LOOKUP_ABORT_NEVER; + if (mail_get_special(mail, MAIL_FETCH_UIDL_BACKEND, &uidl) < 0) { i_error("pop3_migration: Failed to get UIDL for msg %u: %s", mail->seq,