]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Log internal storage error on failure
authorMartti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Thu, 16 Mar 2017 09:15:18 +0000 (11:15 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 27 Mar 2017 10:02:51 +0000 (13:02 +0300)
49 files changed:
src/doveadm/doveadm-mail-altmove.c
src/doveadm/doveadm-mail-copymove.c
src/doveadm/doveadm-mail-deduplicate.c
src/doveadm/doveadm-mail-expunge.c
src/doveadm/doveadm-mail-fetch.c
src/doveadm/doveadm-mail-flags.c
src/doveadm/doveadm-mail-import.c
src/doveadm/doveadm-mail-index.c
src/doveadm/doveadm-mail-iter.c
src/doveadm/doveadm-mail-mailbox-metadata.c
src/doveadm/doveadm-mail-mailbox-status.c
src/doveadm/doveadm-mail-mailbox.c
src/doveadm/doveadm-mail-save.c
src/doveadm/doveadm-mail-search.c
src/doveadm/doveadm-mail.c
src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
src/doveadm/dsync/dsync-brain-mailbox.c
src/doveadm/dsync/dsync-brain.c
src/doveadm/dsync/dsync-mailbox-export.c
src/doveadm/dsync/dsync-mailbox-import.c
src/doveadm/dsync/dsync-mailbox-tree-fill.c
src/imap/imap-state.c
src/indexer/master-connection.c
src/lda/main.c
src/lib-imap-urlauth/imap-urlauth-backend.c
src/lib-lda/mail-deliver.c
src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
src/lib-storage/index/index-mailbox-size.c
src/lib-storage/mail-autoexpunge.c
src/lib-storage/mail-storage.c
src/lib-storage/mailbox-guid-cache.c
src/lmtp/commands.c
src/plugins/acl/doveadm-acl.c
src/plugins/fts-lucene/fts-backend-lucene.c
src/plugins/fts-lucene/lucene-wrapper.cc
src/plugins/fts/fts-api.c
src/plugins/fts/fts-build-mail.c
src/plugins/lazy-expunge/lazy-expunge-plugin.c
src/plugins/mail-crypt/doveadm-mail-crypt.c
src/plugins/mail-crypt/mail-crypt-acl-plugin.c
src/plugins/mail-crypt/mail-crypt-key.c
src/plugins/mail-crypt/test-mail-key.c
src/plugins/pop3-migration/pop3-migration-plugin.c
src/plugins/push-notification/push-notification-driver-ox.c
src/plugins/push-notification/push-notification-event-mailboxcreate.c
src/plugins/quota/quota-count.c
src/plugins/quota/quota.c
src/pop3/pop3-client.c
src/pop3/pop3-commands.c

index a4bfc38abcd19858ecfff5b3676035e2e1e94cb3..7ce485d8bb7d7b0ffade4fafda037f1b44fb9134 100644 (file)
@@ -45,7 +45,7 @@ ns_purge(struct doveadm_mail_cmd_context *ctx, struct mail_namespace *ns,
 {
        if (mail_storage_purge(storage) < 0) {
                i_error("Purging namespace '%s' failed: %s", ns->prefix,
-                       mail_storage_get_last_error(storage, NULL));
+                       mail_storage_get_last_internal_error(storage, NULL));
                doveadm_mail_failed_storage(ctx, storage);
                return -1;
        }
index 0b927ecf5b729dd80702e3ae721253bc8dac2934..14b3d9d8efd9bb0fc4839b6ae7eeb3786f72917d 100644 (file)
@@ -52,7 +52,7 @@ cmd_copy_box(struct copy_cmd_context *ctx, struct mailbox *destbox,
                        i_error("%s message UID %u from '%s' failed: %s",
                                ctx->move ? "Moving" : "Copying",
                                mail->uid, info->vname,
-                               mailbox_get_last_error(destbox, NULL));
+                               mailbox_get_last_internal_error(destbox, NULL));
                        doveadm_mail_failed_mailbox(&ctx->ctx, destbox);
                        ret = -1;
                }
@@ -61,7 +61,7 @@ cmd_copy_box(struct copy_cmd_context *ctx, struct mailbox *destbox,
        if (mailbox_transaction_commit(&desttrans) < 0) {
                i_error("Committing %s mails failed: %s",
                        ctx->move ? "moved" : "copied",
-                       mailbox_get_last_error(destbox, NULL));
+                       mailbox_get_last_internal_error(destbox, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, destbox);
                /* rollback expunges */
                doveadm_mail_iter_deinit_rollback(&iter);
@@ -110,7 +110,7 @@ cmd_copy_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
        destbox = mailbox_alloc(ns->list, ctx->destname, MAILBOX_FLAG_SAVEONLY);
        if (mailbox_open(destbox) < 0) {
                i_error("Can't open mailbox '%s': %s", ctx->destname,
-                       mailbox_get_last_error(destbox, NULL));
+                       mailbox_get_last_internal_error(destbox, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, destbox);
                mailbox_free(&destbox);
                return -1;
@@ -128,7 +128,7 @@ cmd_copy_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
 
        if (mailbox_sync(destbox, 0) < 0) {
                i_error("Syncing mailbox '%s' failed: %s", ctx->destname,
-                       mailbox_get_last_error(destbox, NULL));
+                       mailbox_get_last_internal_error(destbox, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, destbox);
                ret = -1;
        }
index 9c25d859381f7658e7b8f77cf0e662220a60a274..cf96cb6fbd5215031c7d3113a31be9db5bae1dd7 100644 (file)
@@ -51,14 +51,14 @@ static int cmd_deduplicate_uidlist(struct doveadm_mail_cmd_context *_ctx,
        if (mailbox_search_deinit(&search_ctx) < 0) {
                i_error("Searching mailbox '%s' failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                ret = -1;
        }
        if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Committing mailbox '%s' transaction failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                ret = -1;
        }
@@ -91,7 +91,7 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
        while (doveadm_mail_iter_next(iter, &mail)) {
                if (ctx->by_msgid) {
                        if (mail_get_first_header(mail, "Message-ID", &key) < 0) {
-                               errstr = mailbox_get_last_error(mail->box, &error);
+                               errstr = mailbox_get_last_internal_error(mail->box, &error);
                                if (error == MAIL_ERROR_NOTFOUND)
                                        continue;
                                i_error("Couldn't lookup Message-ID: for UID=%u: %s",
@@ -102,7 +102,7 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
                        }
                } else {
                        if (mail_get_special(mail, MAIL_FETCH_GUID, &key) < 0) {
-                               errstr = mailbox_get_last_error(mail->box, &error);
+                               errstr = mailbox_get_last_internal_error(mail->box, &error);
                                if (error == MAIL_ERROR_NOTFOUND)
                                        continue;
                                i_error("Couldn't lookup GUID: for UID=%u: %s",
@@ -148,7 +148,7 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
        if (mailbox_sync(box, 0) < 0) {
                i_error("Syncing mailbox '%s' failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                ret = -1;
        }
index ca8e3c2690975a29cce6eddfffc498d64b7625cf..ebf612f956905612789ed25c137e8ddd3a383c72 100644 (file)
@@ -43,7 +43,7 @@ cmd_expunge_box(struct doveadm_mail_cmd_context *_ctx,
        else if (mailbox_sync(box, 0) < 0) {
                i_error("Syncing mailbox '%s' failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                ret = -1;
        }
@@ -54,7 +54,7 @@ cmd_expunge_box(struct doveadm_mail_cmd_context *_ctx,
                        if (error != MAIL_ERROR_EXISTS) {
                                i_error("Deleting mailbox '%s' failed: %s",
                                        mailbox_get_vname(box),
-                                       mailbox_get_last_error(box, NULL));
+                                       mailbox_get_last_internal_error(box, NULL));
                                doveadm_mail_failed_mailbox(_ctx, box);
                                ret = -1;
                        }
@@ -62,7 +62,7 @@ cmd_expunge_box(struct doveadm_mail_cmd_context *_ctx,
                        if (mailbox_set_subscribed(box, FALSE) < 0) {
                                i_error("Unsubscribing mailbox '%s' failed: %s",
                                        mailbox_get_vname(box),
-                                       mailbox_get_last_error(box, NULL));
+                                       mailbox_get_last_internal_error(box, NULL));
                                doveadm_mail_failed_mailbox(_ctx, box);
                                ret = -1;
                        }
index fd856f20ad0cb73ebaa75d28125e8680d49b22f3..ea74e0b9ba12a1e58b2397b59ec1884d92888f49 100644 (file)
@@ -589,7 +589,7 @@ static int cmd_fetch_mail(struct fetch_cmd_context *ctx)
                                field->name, mailbox_get_vname(mail->box),
                                mail->uid,
                                ctx->print_error != NULL ? ctx->print_error :
-                               mailbox_get_last_error(mail->box, NULL));
+                               mailbox_get_last_internal_error(mail->box, NULL));
                        doveadm_mail_failed_mailbox(&ctx->ctx, mail->box);
                        ctx->print_error = NULL;
                        ret = -1;
index e5dc5641835fe0363b08327d06c9b4acec369f85..5b0e25f498794225ffd7ef452c3a3174a2b02c06 100644 (file)
@@ -33,7 +33,7 @@ cmd_flags_run_box(struct flags_cmd_context *ctx,
        if (ctx->keywords != NULL) {
                if (mailbox_keywords_create(box, ctx->keywords, &kw) < 0) {
                        i_error("Invalid keywords: %s",
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        (void)doveadm_mail_iter_deinit(&iter);
                        ctx->ctx.exit_code = DOVEADM_EX_NOTPOSSIBLE;
                        return -1;
index 50d13b657a7bba4a926bce3cf8f7a3438fa06a61..cabd369ab4fbac8da812b96bb5cda2a0fb0887be 100644 (file)
@@ -64,7 +64,7 @@ dest_mailbox_open_or_create(struct import_cmd_context *ctx,
 
        box = mailbox_alloc(ns->list, name, MAILBOX_FLAG_SAVEONLY);
        if (mailbox_create(box, NULL, FALSE) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error != MAIL_ERROR_EXISTS) {
                        i_error("Couldn't create mailbox %s: %s", name, errstr);
                        doveadm_mail_failed_mailbox(&ctx->ctx, box);
@@ -75,12 +75,12 @@ dest_mailbox_open_or_create(struct import_cmd_context *ctx,
        if (ctx->subscribe) {
                if (mailbox_set_subscribed(box, TRUE) < 0) {
                        i_error("Couldn't subscribe to mailbox %s: %s",
-                               name, mailbox_get_last_error(box, NULL));
+                               name, mailbox_get_last_internal_error(box, NULL));
                }
        }
        if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
                i_error("Syncing mailbox %s failed: %s", name,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, box);
                mailbox_free(&box);
                return -1;
@@ -110,14 +110,14 @@ cmd_import_box_contents(struct doveadm_mail_iter *iter, struct mail *src_mail,
                if (mailbox_copy(&save_ctx, src_mail) < 0) {
                        i_error("Copying box=%s uid=%u failed: %s",
                                mailbox, src_mail->uid,
-                               mailbox_get_last_error(dest_box, NULL));
+                               mailbox_get_last_internal_error(dest_box, NULL));
                        ret = -1;
                }
        } while (doveadm_mail_iter_next(iter, &src_mail));
 
        if (mailbox_transaction_commit(&dest_trans) < 0) {
                i_error("Committing copied mails to %s failed: %s", mailbox,
-                       mailbox_get_last_error(dest_box, NULL));
+                       mailbox_get_last_internal_error(dest_box, NULL));
                ret = -1;
        }
        return ret;
index 3e475c68c703ebf0eaccf5483cad106d370afaf6..2656dece8c88dca77ac9beede4b0e90ca3b7ecbe 100644 (file)
@@ -41,12 +41,14 @@ static int cmd_index_box_precache(struct mailbox *box)
        if (mailbox_get_metadata(box, MAILBOX_METADATA_PRECACHE_FIELDS,
                                 &metadata) < 0) {
                i_error("Mailbox %s: Precache-fields lookup failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
        }
        if (mailbox_get_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ,
                               &status) < 0) {
                i_error("Mailbox %s: Status lookup failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
@@ -82,12 +84,14 @@ static int cmd_index_box_precache(struct mailbox *box)
                printf("\r%u/%u\n", counter, max);
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("Mailbox %s: Mail search failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Mailbox %s: Transaction commit failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        return ret;
@@ -108,7 +112,7 @@ cmd_index_box(struct index_cmd_context *ctx, const struct mailbox_info *info)
                   while with large maildirs. */
                if (mailbox_open(box) < 0) {
                        i_error("Opening mailbox %s failed: %s", info->vname,
-                               mail_storage_get_last_error(mailbox_get_storage(box), NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        doveadm_mail_failed_mailbox(&ctx->ctx, box);
                        mailbox_free(&box);
                        return -1;
@@ -123,7 +127,7 @@ cmd_index_box(struct index_cmd_context *ctx, const struct mailbox_info *info)
 
        if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
                i_error("Syncing mailbox %s failed: %s", info->vname,
-                       mail_storage_get_last_error(mailbox_get_storage(box), NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, box);
                ret = -1;
        } else {
index f299bf7028f0329758f58ff758db9a29094d94d3..44186aaab03ca7f437308159abab65189f612ad2 100644 (file)
@@ -40,7 +40,7 @@ int doveadm_mail_iter_init(struct doveadm_mail_cmd_context *ctx,
        iter->search_args = search_args;
 
        if (mailbox_sync(iter->box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
-               errstr = mailbox_get_last_error(iter->box, &error);
+               errstr = mailbox_get_last_internal_error(iter->box, &error);
                if (error == MAIL_ERROR_NOTFOUND) {
                        /* just ignore this mailbox */
                        *iter_r = iter;
@@ -74,7 +74,7 @@ doveadm_mail_iter_deinit_transaction(struct doveadm_mail_iter *iter,
                if (mailbox_search_deinit(&iter->search_ctx) < 0) {
                        i_error("Searching mailbox %s failed: %s",
                                mailbox_get_vname(iter->box),
-                               mailbox_get_last_error(iter->box, NULL));
+                               mailbox_get_last_internal_error(iter->box, NULL));
                        ret = -1;
                }
        }
@@ -84,7 +84,7 @@ doveadm_mail_iter_deinit_transaction(struct doveadm_mail_iter *iter,
                if (mailbox_transaction_commit(&iter->t) < 0) {
                        i_error("Committing mailbox %s failed: %s",
                                mailbox_get_vname(iter->box),
-                               mailbox_get_last_error(iter->box, NULL));
+                               mailbox_get_last_internal_error(iter->box, NULL));
                        ret = -1;
                }
        } else {
@@ -109,7 +109,7 @@ doveadm_mail_iter_deinit_full(struct doveadm_mail_iter **_iter,
                if (ret < 0) {
                        i_error("Mailbox %s: Mailbox sync failed: %s",
                                mailbox_get_vname(iter->box),
-                               mailbox_get_last_error(iter->box, NULL));
+                               mailbox_get_last_internal_error(iter->box, NULL));
                }
        }
        if (ret < 0)
index b00f24f7772ccb9527f58f7af0e25f4f9b003100..c3ed7482a8e397ac85c08afd7307a435aeeeb06d 100644 (file)
@@ -49,7 +49,7 @@ cmd_mailbox_metadata_open_mailbox(struct metadata_cmd_context *mctx,
 
        if (mailbox_open(*box_r) < 0) {
                i_error("Failed to open mailbox: %s",
-                       mailbox_get_last_error(*box_r, NULL));
+                       mailbox_get_last_internal_error(*box_r, NULL));
                doveadm_mail_failed_mailbox(&mctx->ctx, *box_r);
                mailbox_free(box_r);
                return -1;
@@ -81,12 +81,12 @@ cmd_mailbox_metadata_set_run(struct doveadm_mail_cmd_context *_ctx,
                mailbox_attribute_set(trans, ctx->key_type, ctx->key, &ctx->value);
        if (ret < 0) {
                i_error("Failed to set attribute: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                mailbox_transaction_rollback(&trans);
        } else if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Failed to commit transaction: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
                ret = -1;
        }
@@ -210,7 +210,7 @@ cmd_mailbox_metadata_get_run(struct doveadm_mail_cmd_context *_ctx,
        ret = mailbox_attribute_get_stream(trans, ctx->key_type, ctx->key, &value);
        if (ret < 0) {
                i_error("Failed to get attribute: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(_ctx, box);
        } else if (ret == 0) {
                /* not found, print as empty */
@@ -269,7 +269,7 @@ cmd_mailbox_metadata_list_run_iter(struct metadata_cmd_context *ctx,
        if (mailbox_attribute_iter_deinit(&iter) < 0) {
                i_error("Mailbox %s: Failed to iterate mailbox attributes: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        return 0;
index 9d14cb672f92a1aff99b70293260fec4bae9de0a..316bbd47be5b18d2bd611c5c3a3bc371c8cbf33b 100644 (file)
@@ -130,7 +130,8 @@ status_mailbox(struct status_cmd_context *ctx, const struct mailbox_info *info)
        if (mailbox_get_status(box, ctx->status_items, &status) < 0 ||
            mailbox_get_metadata(box, ctx->metadata_items, &metadata) < 0) {
                i_error("Mailbox %s: Failed to lookup mailbox status: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(&ctx->ctx, box);
                mailbox_free(&box);
                return -1;
index 1e96b7f7530af2087edd85280802f745dd596c71..c4dbca8a592b41955ffc276acdc9b8ea44632ca9 100644 (file)
@@ -244,14 +244,14 @@ cmd_mailbox_create_run(struct doveadm_mail_cmd_context *_ctx,
                box = mailbox_alloc(ns->list, name, 0);
                if (mailbox_create(box, &ctx->update, directory) < 0) {
                        i_error("Can't create mailbox %s: %s", name,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        doveadm_mail_failed_mailbox(_ctx, box);
                        ret = -1;
                }
                if (ctx->ctx.subscriptions) {
                        if (mailbox_set_subscribed(box, TRUE) < 0) {
                                i_error("Can't subscribe to mailbox %s: %s", name,
-                                       mailbox_get_last_error(box, NULL));
+                                       mailbox_get_last_internal_error(box, NULL));
                                doveadm_mail_failed_mailbox(_ctx, box);
                                ret = -1;
                        }
@@ -377,14 +377,14 @@ cmd_mailbox_delete_run(struct doveadm_mail_cmd_context *_ctx,
                        mailbox_delete(box);
                if (ret2 < 0) {
                        i_error("Can't delete mailbox %s: %s", name,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        doveadm_mail_failed_mailbox(_ctx, box);
                        ret = -1;
                }
                if (ctx->ctx.subscriptions) {
                        if (mailbox_set_subscribed(box, FALSE) < 0) {
                                i_error("Can't unsubscribe mailbox %s: %s", name,
-                                       mail_storage_get_last_error(storage, NULL));
+                                       mail_storage_get_last_internal_error(storage, NULL));
                                doveadm_mail_failed_mailbox(_ctx, box);
                                ret = -1;
                        }
@@ -466,20 +466,20 @@ cmd_mailbox_rename_run(struct doveadm_mail_cmd_context *_ctx,
        newbox = mailbox_alloc(newns->list, newname, 0);
        if (mailbox_rename(oldbox, newbox) < 0) {
                i_error("Can't rename mailbox %s to %s: %s", oldname, newname,
-                       mailbox_get_last_error(oldbox, NULL));
+                       mailbox_get_last_internal_error(oldbox, NULL));
                doveadm_mail_failed_mailbox(_ctx, oldbox);
                ret = -1;
        }
        if (ctx->ctx.subscriptions) {
                if (mailbox_set_subscribed(oldbox, FALSE) < 0) {
                        i_error("Can't unsubscribe mailbox %s: %s", ctx->oldname,
-                               mailbox_get_last_error(oldbox, NULL));
+                               mailbox_get_last_internal_error(oldbox, NULL));
                        doveadm_mail_failed_mailbox(_ctx, oldbox);
                        ret = -1;
                }
                if (mailbox_set_subscribed(newbox, TRUE) < 0) {
                        i_error("Can't subscribe to mailbox %s: %s", ctx->newname,
-                               mailbox_get_last_error(newbox, NULL));
+                               mailbox_get_last_internal_error(newbox, NULL));
                        doveadm_mail_failed_mailbox(_ctx, newbox);
                        ret = -1;
                }
@@ -532,7 +532,7 @@ cmd_mailbox_subscribe_run(struct doveadm_mail_cmd_context *_ctx,
                        i_error("Can't %s mailbox %s: %s", name,
                                ctx->ctx.subscriptions ? "subscribe to" :
                                "unsubscribe",
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        doveadm_mail_failed_mailbox(_ctx, box);
                        ret = -1;
                }
@@ -659,7 +659,7 @@ int cmd_mailbox_update_run(struct doveadm_mail_cmd_context *_ctx,
        if ((ret = mailbox_update(box, &(ctx->update))) != 0) {
                i_error("Cannot update %s: %s",
                        ctx->mailbox,
-                       mailbox_get_last_error(box, &mail_error));
+                       mailbox_get_last_internal_error(box, &mail_error));
                doveadm_mail_failed_error(_ctx, mail_error);
        }
 
index 2f5f0d9e1db3e9f394dff100546315802a8b87dc..5badfdb7c03320358f1995be1f516f005a3489ab 100644 (file)
@@ -30,7 +30,8 @@ cmd_save_to_mailbox(struct save_cmd_context *ctx, struct mailbox *box,
 
        if (mailbox_open(box) < 0) {
                i_error("Failed to open mailbox %s: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_storage(&ctx->ctx, storage);
                return -1;
        }
@@ -38,7 +39,8 @@ cmd_save_to_mailbox(struct save_cmd_context *ctx, struct mailbox *box,
        trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
        save_ctx = mailbox_save_alloc(trans);
        if (mailbox_save_begin(&save_ctx, input) < 0) {
-               i_error("Saving failed: %s", mailbox_get_last_error(box, NULL));
+               i_error("Saving failed: %s",
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_storage(&ctx->ctx, storage);
                mailbox_transaction_rollback(&trans);
                return -1;
@@ -56,15 +58,16 @@ cmd_save_to_mailbox(struct save_cmd_context *ctx, struct mailbox *box,
                i_error("read(msg input) failed: %s", i_stream_get_error(input));
                doveadm_mail_failed_error(&ctx->ctx, MAIL_ERROR_TEMP);
        } else if (save_failed) {
-               i_error("Saving failed: %s", mailbox_get_last_error(box, NULL));
+               i_error("Saving failed: %s",
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_storage(&ctx->ctx, storage);
        } else if (mailbox_save_finish(&save_ctx) < 0) {
                i_error("Saving failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_storage(&ctx->ctx, storage);
        } else if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Save transaction commit failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_storage(&ctx->ctx, storage);
        } else {
                ret = 0;
index 60e6d6ca9bde148272fb96ace050efbed920082b..e246da408e4eb518b5ff9366dfe1c788acc1045f 100644 (file)
@@ -28,7 +28,7 @@ cmd_search_box(struct doveadm_mail_cmd_context *ctx,
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
                i_error("Couldn't get mailbox '%s' GUID: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
                doveadm_mail_failed_mailbox(ctx, box);
        } else {
index d26ed0b34cb5b864b9c50a2f088ff40596002c01..639ca4f7c7ae85f0079274d4b24e4263fa93045d 100644 (file)
@@ -148,7 +148,7 @@ cmd_purge_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
                storage = mail_namespace_get_default_storage(ns);
                if (mail_storage_purge(storage) < 0) {
                        i_error("Purging namespace '%s' failed: %s", ns->prefix,
-                               mail_storage_get_last_error(storage, NULL));
+                               mail_storage_get_last_internal_error(storage, NULL));
                        doveadm_mail_failed_storage(ctx, storage);
                        ret = -1;
                }
@@ -287,13 +287,13 @@ static int cmd_force_resync_box(struct doveadm_mail_cmd_context *ctx,
                            MAILBOX_FLAG_IGNORE_ACLS);
        if (mailbox_open(box) < 0) {
                i_error("Opening mailbox %s failed: %s", info->vname,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(ctx, box);
                ret = -1;
        } else if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FORCE_RESYNC |
                                MAILBOX_SYNC_FLAG_FIX_INCONSISTENT) < 0) {
                i_error("Forcing a resync on mailbox %s failed: %s",
-                       info->vname, mailbox_get_last_error(box, NULL));
+                       info->vname, mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(ctx, box);
                ret = -1;
        }
index 4ad00fa9130d950d50672794dfe2b641cafe74d9..0d3a9535639fcb5453f19308ac7c2c661ff71079 100644 (file)
@@ -22,7 +22,7 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
        update.uid_validity = uid_validity;
 
        if (mailbox_create(box, &update, FALSE) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error != MAIL_ERROR_EXISTS) {
                        i_error("Can't create mailbox %s: %s",
                                mailbox_get_vname(box), errstr);
@@ -39,7 +39,7 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
        if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
                i_error("Can't sync mailbox %s: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, error_r));
+                       mailbox_get_last_internal_error(box, error_r));
                return -1;
        }
 
@@ -52,7 +52,7 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
                i_error("Can't get mailbox GUID %s: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, error_r));
+                       mailbox_get_last_internal_error(box, error_r));
                return -1;
        }
 
@@ -78,7 +78,7 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
                if (mailbox_update(box, &update) < 0) {
                        i_error("Can't update mailbox GUID %s: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, error_r));
+                               mailbox_get_last_internal_error(box, error_r));
                        return -1;
                }
                /* verify that the update worked */
@@ -86,7 +86,7 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
                                         &metadata) < 0) {
                        i_error("Can't get mailbox GUID %s: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, error_r));
+                               mailbox_get_last_internal_error(box, error_r));
                        return -1;
                }
                if (memcmp(mailbox_guid, metadata.guid,
@@ -209,7 +209,7 @@ int dsync_brain_mailbox_tree_sync_change(struct dsync_brain *brain,
                break;
        }
        if (ret < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error == MAIL_ERROR_EXISTS ||
                    error == MAIL_ERROR_NOTFOUND) {
                        /* mailbox was already created or was already deleted.
index 39906b961f00a754ad097b83c832c9994651607a..ab7602390444a41a8252022a128823ea9a3140bd 100644 (file)
@@ -31,7 +31,7 @@ ns_mailbox_try_alloc(struct dsync_brain *brain, struct mail_namespace *ns,
        box = mailbox_alloc_guid(ns->list, guid, flags);
        ret = mailbox_exists(box, FALSE, &existence);
        if (ret < 0) {
-               *errstr_r = mailbox_get_last_error(box, error_r);
+               *errstr_r = mailbox_get_last_internal_error(box, error_r);
                mailbox_free(&box);
                return -1;
        }
@@ -404,7 +404,7 @@ static int dsync_box_get(struct mailbox *box, struct dsync_mailbox *dsync_box_r,
        /* get metadata first, since it may autocreate the mailbox */
        if (mailbox_get_metadata(box, metadata_items, &metadata) < 0 ||
            mailbox_get_status(box, status_items, &status) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error == MAIL_ERROR_NOTFOUND ||
                    error == MAIL_ERROR_NOTPOSSIBLE) {
                        /* Mailbox isn't selectable, try the next one. We
@@ -526,7 +526,7 @@ dsync_brain_try_next_mailbox(struct dsync_brain *brain, struct mailbox **box_r,
                if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
                        i_error("Can't sync mailbox %s: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, &brain->mail_error));
+                               mailbox_get_last_internal_error(box, &brain->mail_error));
                        brain->failed = TRUE;
                        mailbox_free(&box);
                        return -1;
@@ -713,7 +713,7 @@ bool dsync_brain_mailbox_update_pre(struct dsync_brain *brain,
        if (mailbox_update(box, &update) < 0) {
                i_error("Couldn't update mailbox %s metadata: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, &brain->mail_error));
+                       mailbox_get_last_internal_error(box, &brain->mail_error));
                brain->failed = TRUE;
        }
        return ret;
@@ -788,7 +788,7 @@ bool dsync_brain_slave_recv_mailbox(struct dsync_brain *brain)
        if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
                i_error("Can't sync mailbox %s: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, &brain->mail_error));
+                       mailbox_get_last_internal_error(box, &brain->mail_error));
                mailbox_free(&box);
                brain->failed = TRUE;
                return TRUE;
index fa0e14f94747c0f85118df34c8e21ae18897227f..2225dc0e9f1cd2698d7decf904e2d686646f1ccc 100644 (file)
@@ -318,7 +318,7 @@ static void dsync_brain_purge(struct dsync_brain *brain)
                storage = mail_namespace_get_default_storage(ns);
                if (mail_storage_purge(storage) < 0) {
                        i_error("Purging namespace '%s' failed: %s", ns->prefix,
-                               mail_storage_get_last_error(storage, NULL));
+                               mail_storage_get_last_internal_error(storage, NULL));
                }
        }
 }
index 724a60ccad15839db4f5675d8f87a15f450a1a13..61b3e6a8d4dd36bb2ced3094d0fc65cf82d71a9f 100644 (file)
@@ -73,7 +73,7 @@ static int dsync_mail_error(struct dsync_mailbox_exporter *exporter,
        const char *errstr;
        enum mail_error error;
 
-       errstr = mailbox_get_last_error(exporter->box, &error);
+       errstr = mailbox_get_last_internal_error(exporter->box, &error);
        if (error == MAIL_ERROR_EXPUNGED)
                return 0;
 
@@ -423,8 +423,8 @@ dsync_mailbox_export_search(struct dsync_mailbox_exporter *exporter)
            exporter->error == NULL) {
                exporter->error = p_strdup_printf(exporter->pool,
                        "Mail search failed: %s",
-                       mailbox_get_last_error(exporter->box,
-                                              &exporter->mail_error));
+                       mailbox_get_last_internal_error(exporter->box,
+                                                       &exporter->mail_error));
        }
 }
 
@@ -561,8 +561,8 @@ dsync_mailbox_export_iter_next_nonexistent_attr(struct dsync_mailbox_exporter *e
                                                 attr->key, &value) < 0) {
                        exporter->error = p_strdup_printf(exporter->pool,
                                "Mailbox attribute %s lookup failed: %s", attr->key,
-                               mailbox_get_last_error(exporter->box,
-                                                      &exporter->mail_error));
+                               mailbox_get_last_internal_error(exporter->box,
+                                                               &exporter->mail_error));
                        break;
                }
                if ((value.flags & MAIL_ATTRIBUTE_VALUE_FLAG_READONLY) != 0) {
@@ -614,8 +614,8 @@ dsync_mailbox_export_iter_next_attr(struct dsync_mailbox_exporter *exporter)
                                                 &value) < 0) {
                        exporter->error = p_strdup_printf(exporter->pool,
                                "Mailbox attribute %s lookup failed: %s", key,
-                               mailbox_get_last_error(exporter->box,
-                                                      &exporter->mail_error));
+                               mailbox_get_last_internal_error(exporter->box,
+                                                               &exporter->mail_error));
                        return -1;
                }
                if ((value.flags & MAIL_ATTRIBUTE_VALUE_FLAG_READONLY) != 0) {
@@ -658,8 +658,8 @@ dsync_mailbox_export_iter_next_attr(struct dsync_mailbox_exporter *exporter)
        if (mailbox_attribute_iter_deinit(&exporter->attr_iter) < 0) {
                exporter->error = p_strdup_printf(exporter->pool,
                        "Mailbox attribute iteration failed: %s",
-                       mailbox_get_last_error(exporter->box,
-                                              &exporter->mail_error));
+                       mailbox_get_last_internal_error(exporter->box,
+                                                       &exporter->mail_error));
                return -1;
        }
        if (exporter->attr_type == MAIL_ATTRIBUTE_TYPE_PRIVATE) {
@@ -800,8 +800,8 @@ dsync_mailbox_export_body_search_deinit(struct dsync_mailbox_exporter *exporter)
            exporter->error == NULL) {
                exporter->error = p_strdup_printf(exporter->pool,
                        "Mail search failed: %s",
-                       mailbox_get_last_error(exporter->box,
-                                              &exporter->mail_error));
+                       mailbox_get_last_internal_error(exporter->box,
+                                                       &exporter->mail_error));
        }
 }
 
index f599d58e9720a535417f188e55375152b4831b19..8e6163e7028b82dfc0d19dabda7998840631a1cd 100644 (file)
@@ -334,7 +334,8 @@ dsync_mailbox_import_lookup_attr(struct dsync_mailbox_importer *importer,
        if (mailbox_attribute_get_stream(importer->trans, type, key, &value) < 0) {
                i_error("Mailbox %s: Failed to get attribute %s: %s",
                        mailbox_get_vname(importer->box), key,
-                       mailbox_get_last_error(importer->box, &importer->mail_error));
+                       mailbox_get_last_internal_error(importer->box,
+                                                       &importer->mail_error));
                importer->failed = TRUE;
                return -1;
        }
@@ -537,7 +538,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, NULL));
+                       mailbox_get_last_internal_error(importer->box, NULL));
                /* the attributes aren't vital, don't fail everything just
                   because of them. */
        }
@@ -571,7 +572,7 @@ static void dsync_mail_error(struct dsync_mailbox_importer *importer,
        const char *errstr;
        enum mail_error error;
 
-       errstr = mailbox_get_last_error(importer->box, &error);
+       errstr = mailbox_get_last_internal_error(importer->box, &error);
        if (error == MAIL_ERROR_EXPUNGED)
                return;
 
@@ -1873,7 +1874,7 @@ dsync_mailbox_import_local_uid(struct dsync_mailbox_importer *importer,
        /* NOTE: Errors are logged, but they don't cause the entire import
           to fail. */
        if (dsync_mail_fill(mail, TRUE, dmail_r, &error_field) < 0) {
-               errstr = mailbox_get_last_error(mail->box, &error);
+               errstr = mailbox_get_last_internal_error(mail->box, &error);
                if (error == MAIL_ERROR_EXPUNGED)
                        return 0;
 
@@ -2121,7 +2122,7 @@ dsync_mailbox_import_find_virtual_uids(struct dsync_mailbox_importer *importer)
        if (mailbox_sync(importer->virtual_all_box, 0) < 0) {
                i_error("Couldn't sync \\All mailbox '%s': %s",
                        mailbox_get_vname(importer->virtual_all_box),
-                       mailbox_get_last_error(importer->virtual_all_box, NULL));
+                       mailbox_get_last_internal_error(importer->virtual_all_box, NULL));
                return;
        }
 
@@ -2147,7 +2148,7 @@ dsync_mailbox_import_find_virtual_uids(struct dsync_mailbox_importer *importer)
        if (mailbox_search_deinit(&search_ctx) < 0) {
                i_error("Couldn't search \\All mailbox '%s': %s",
                        mailbox_get_vname(importer->virtual_all_box),
-                       mailbox_get_last_error(importer->virtual_all_box, NULL));
+                       mailbox_get_last_internal_error(importer->virtual_all_box, NULL));
        }
 
        importer->virtual_mail = mail_alloc(importer->virtual_trans, 0, NULL);
@@ -2204,8 +2205,8 @@ int dsync_mailbox_import_changes_finish(struct dsync_mailbox_importer *importer)
                if (mailbox_search_deinit(&importer->search_ctx) < 0) {
                        i_error("Mailbox %s: Search failed: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        importer->failed = TRUE;
                }
        }
@@ -2389,8 +2390,8 @@ dsync_mailbox_save_body(struct dsync_mailbox_importer *importer,
                        i_error("Mailbox %s: Failed to read mail %s uid=%u: %s",
                                mailbox_get_vname(importer->box),
                                error_field, mail->uid,
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        importer->failed = TRUE;
                        mailbox_save_cancel(&save_ctx);
                        return TRUE;
@@ -2411,8 +2412,8 @@ dsync_mailbox_save_body(struct dsync_mailbox_importer *importer,
        if (mailbox_save_begin(&save_ctx, input) < 0) {
                i_error("Mailbox %s: Saving failed: %s",
                        mailbox_get_vname(importer->box),
-                       mailbox_get_last_error(importer->box,
-                                              &importer->mail_error));
+                       mailbox_get_last_internal_error(importer->box,
+                                                       &importer->mail_error));
                importer->failed = TRUE;
                return TRUE;
        }
@@ -2435,8 +2436,8 @@ dsync_mailbox_save_body(struct dsync_mailbox_importer *importer,
        } else if (save_failed) {
                i_error("Mailbox %s: Saving failed: %s",
                        mailbox_get_vname(importer->box),
-                       mailbox_get_last_error(importer->box,
-                                              &importer->mail_error));
+                       mailbox_get_last_internal_error(importer->box,
+                                                       &importer->mail_error));
                mailbox_save_cancel(&save_ctx);
                importer->failed = TRUE;
        } else {
@@ -2444,8 +2445,8 @@ dsync_mailbox_save_body(struct dsync_mailbox_importer *importer,
                if (mailbox_save_finish(&save_ctx) < 0) {
                        i_error("Mailbox %s: Saving failed: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        importer->failed = TRUE;
                } else {
                        dsync_mailbox_import_saved_uid(importer,
@@ -2564,7 +2565,7 @@ reassign_uids_in_seq_range(struct dsync_mailbox_importer *importer,
                if (mailbox_move(&save_ctx, mail) < 0) {
                        i_error("Mailbox %s: Couldn't move mail within mailbox: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, &importer->mail_error));
+                               mailbox_get_last_internal_error(box, &importer->mail_error));
                        ret = -1;
                } else if (ret > 0) {
                        ret = 0;
@@ -2574,14 +2575,14 @@ reassign_uids_in_seq_range(struct dsync_mailbox_importer *importer,
        if (mailbox_search_deinit(&search_ctx) < 0) {
                i_error("Mailbox %s: mail search failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, &importer->mail_error));
+                       mailbox_get_last_internal_error(box, &importer->mail_error));
                ret = -1;
        }
 
        if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Mailbox %s: UID reassign commit failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, &importer->mail_error));
+                       mailbox_get_last_internal_error(box, &importer->mail_error));
                ret = -1;
        }
        if (ret == 0) {
@@ -2666,7 +2667,7 @@ dsync_mailbox_import_commit(struct dsync_mailbox_importer *importer, bool final)
                                                   &changes) < 0) {
                i_error("Mailbox %s: Save commit failed: %s",
                        mailbox_get_vname(importer->box),
-                       mailbox_get_last_error(importer->box, &importer->mail_error));
+                       mailbox_get_last_internal_error(importer->box, &importer->mail_error));
                /* removed wanted_uids that weren't actually saved */
                array_delete(&importer->wanted_uids,
                             array_count(&importer->saved_uids),
@@ -2690,8 +2691,8 @@ dsync_mailbox_import_commit(struct dsync_mailbox_importer *importer, bool final)
                if (mailbox_transaction_commit(&importer->trans) < 0) {
                        i_error("Mailbox %s: Commit failed: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        ret = -1;
                }
        }
@@ -2730,8 +2731,8 @@ static int dsync_mailbox_import_finish(struct dsync_mailbox_importer *importer,
                if (mailbox_update(importer->box, &update) < 0) {
                        i_error("Mailbox %s: Update failed: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        ret = -1;
                }
        }
@@ -2740,8 +2741,8 @@ static int dsync_mailbox_import_finish(struct dsync_mailbox_importer *importer,
        if (mailbox_sync(importer->box, 0) < 0) {
                i_error("Mailbox %s: Sync failed: %s",
                        mailbox_get_vname(importer->box),
-                       mailbox_get_last_error(importer->box,
-                                              &importer->mail_error));
+                       mailbox_get_last_internal_error(importer->box,
+                                                       &importer->mail_error));
                ret = -1;
        }
        if (ret == 0) {
@@ -2834,8 +2835,8 @@ int dsync_mailbox_import_deinit(struct dsync_mailbox_importer **_importer,
                if (mailbox_search_deinit(&importer->search_ctx) < 0) {
                        i_error("Mailbox %s: Search failed: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        importer->failed = TRUE;
                }
        }
@@ -2873,8 +2874,8 @@ int dsync_mailbox_import_deinit(struct dsync_mailbox_importer **_importer,
                if (mailbox_delete(importer->box) < 0) {
                        i_error("Couldn't delete mailbox %s: %s",
                                mailbox_get_vname(importer->box),
-                               mailbox_get_last_error(importer->box,
-                                                      &importer->mail_error));
+                               mailbox_get_last_internal_error(importer->box,
+                                                               &importer->mail_error));
                        importer->failed = TRUE;
                }
                *last_messages_count_r = 0;
index 086b7bbabcca52fa146a634038965bdf09f10e1c..337df344c9e88972220e2c933a343b0803367fa8 100644 (file)
@@ -95,7 +95,7 @@ static int dsync_mailbox_tree_add(struct dsync_mailbox_tree *tree,
        /* get GUID and UIDVALIDITY for selectable mailbox */
        box = mailbox_alloc(info->ns->list, info->vname, MAILBOX_FLAG_READONLY);
        if (dsync_mailbox_tree_get_selectable(box, &metadata, &status) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                switch (error) {
                case MAIL_ERROR_NOTFOUND:
                        /* mailbox was just deleted? */
@@ -266,7 +266,7 @@ dsync_mailbox_tree_fix_guid_duplicate(struct dsync_mailbox_tree *tree,
        box = mailbox_alloc(change_node->ns->list, change_vname, 0);
        if (mailbox_update(box, &update) < 0) {
                i_error("Couldn't update mailbox %s GUID: %s",
-                       change_vname, mailbox_get_last_error(box, NULL));
+                       change_vname, mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        } else {
                memcpy(change_node->mailbox_guid, update.mailbox_guid,
index 0345dce256ff45a7f2192c7f1f67f78e92031bf5..02722aef64ad928c47ca86d6ff13cb01e79a3f61 100644 (file)
@@ -184,7 +184,7 @@ imap_state_export_mailbox_mails(buffer_t *dest, struct mailbox *box,
                        seq_range_array_add(&recent_uids, mail->uid);
        }
        if (mailbox_search_deinit(&search_ctx) < 0) {
-               *error_r = mailbox_get_last_error(box, NULL);
+               *error_r = mailbox_get_last_internal_error(box, NULL);
                ret = -1;
        }
        (void)mailbox_transaction_commit(&trans);
@@ -224,7 +224,7 @@ imap_state_export_mailbox(buffer_t *dest, struct client *client,
        }
 
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
-               *error_r = mailbox_get_last_error(box, &mail_error);
+               *error_r = mailbox_get_last_internal_error(box, &mail_error);
                /* if the selected mailbox can't have a GUID, fail silently */
                return mail_error == MAIL_ERROR_NOTPOSSIBLE ? 0 : -1;
        }
@@ -399,7 +399,7 @@ import_send_expunges(struct client *client,
        }
 
        if (mailbox_search_deinit(&search_ctx) < 0) {
-               *error_r = mailbox_get_last_error(client->mailbox, NULL);
+               *error_r = mailbox_get_last_internal_error(client->mailbox, NULL);
                ret = -1;
        } else if (seq != state->messages) {
                *error_r = t_strdup_printf("Message count mismatch after "
@@ -575,7 +575,7 @@ import_state_mailbox_open(struct client *client,
        box = mailbox_alloc(ns->list, state->vname, flags);
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("Couldn't open mailbox: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                return -1;
        }
@@ -584,13 +584,13 @@ import_state_mailbox_open(struct client *client,
                ret = mailbox_enable(box, client->enabled_features);
        if (ret < 0 || mailbox_sync(box, 0) < 0) {
                *error_r = t_strdup_printf("Couldn't sync mailbox: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                return -1;
        }
        /* verify that this still looks like the same mailbox */
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
-               *error_r = mailbox_get_last_error(box, NULL);
+               *error_r = mailbox_get_last_internal_error(box, NULL);
                mailbox_free(&box);
                return -1;
        }
index 2033823610ad872e851c8afa3bfe99c9b6149819..9ca4560501336290d2becfbdeef694c5a84d468c 100644 (file)
@@ -70,13 +70,15 @@ index_mailbox_precache(struct master_connection *conn, struct mailbox *box)
        if (mailbox_get_metadata(box, MAILBOX_METADATA_PRECACHE_FIELDS,
                                 &metadata) < 0) {
                i_error("Mailbox %s: Precache-fields lookup failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        if (mailbox_get_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ,
                               &status) < 0) {
                i_error("Mailbox %s: Status lookup failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        seq = status.last_cached_seq + 1;
@@ -108,12 +110,14 @@ index_mailbox_precache(struct master_connection *conn, struct mailbox *box)
        }
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("Mailbox %s: Mail search failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        if (mailbox_transaction_commit(&trans) < 0) {
                i_error("Mailbox %s: Transaction commit failed: %s",
-                       mailbox_get_vname(box), mailbox_get_last_error(box, NULL));
+                       mailbox_get_vname(box),
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        if (ret == 0) {
@@ -141,7 +145,7 @@ index_mailbox(struct master_connection *conn, struct mail_user *user,
        ret = mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path);
        if (ret < 0) {
                i_error("Getting path to mailbox %s failed: %s",
-                       mailbox, mailbox_get_last_error(box, NULL));
+                       mailbox, mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                return -1;
        }
@@ -158,7 +162,7 @@ index_mailbox(struct master_connection *conn, struct mail_user *user,
                   while with large maildirs. */
                if (mailbox_open(box) < 0) {
                        i_error("Opening mailbox %s failed: %s", mailbox,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        ret = -1;
                } else {
                        mailbox_get_open_status(box, STATUS_RECENT, &status);
@@ -173,7 +177,7 @@ index_mailbox(struct master_connection *conn, struct mail_user *user,
                sync_flags |= MAILBOX_SYNC_FLAG_OPTIMIZE;
 
        if (mailbox_sync(box, sync_flags) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error != MAIL_ERROR_NOTFOUND) {
                        i_error("Syncing mailbox %s failed: %s",
                                mailbox, errstr);
index 7c8c17d73de4373ab9b7d3c2fb9d527dec8444aa..73cc0d48d9e985e12f4ee48da991b3293f67a09d 100644 (file)
@@ -196,7 +196,7 @@ lda_raw_mail_open(struct mail_deliver_context *ctx, const char *path)
        }
        if (ret < 0) {
                i_fatal("Can't open delivery mail as raw: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
        }
        mail_user_unref(&raw_mail_user);
 
index 69d771ddf2b48271e8a7c7c260a4a2eda8a8dbb8..783f9dcfd42032b013a06ee11bee7b4796e8ccaa 100644 (file)
@@ -107,7 +107,7 @@ static int imap_urlauth_backend_mailbox_reset_key(struct mailbox *box)
        enum mail_error error;
 
        if (mailbox_open(box) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error == MAIL_ERROR_NOTFOUND || error == MAIL_ERROR_PERM)
                        return 0;
                i_error("urlauth key reset: Couldn't open mailbox %s: %s",
index 7aa2ede11f21fdcae0485dcb9ced9984e284eb65..fcca8c6edc3ed5981c56e8b9f873bc17cbfaace1 100644 (file)
@@ -239,13 +239,13 @@ int mail_deliver_save_open(struct mail_deliver_save_open_context *ctx,
        if (mailbox_open(box) == 0)
                return 0;
 
-       *error_str_r = mailbox_get_last_error(box, error_r);
+       *error_str_r = mailbox_get_last_internal_error(box, error_r);
        if (!ctx->lda_mailbox_autocreate || *error_r != MAIL_ERROR_NOTFOUND)
                return -1;
 
        /* try creating it. */
        if (mailbox_create(box, NULL, FALSE) < 0) {
-               *error_str_r = mailbox_get_last_error(box, error_r);
+               *error_str_r = mailbox_get_last_internal_error(box, error_r);
                if (*error_r != MAIL_ERROR_EXISTS)
                        return -1;
                /* someone else just created it */
@@ -257,7 +257,7 @@ int mail_deliver_save_open(struct mail_deliver_save_open_context *ctx,
 
        /* and try opening again */
        if (mailbox_open(box) < 0) {
-               *error_str_r = mailbox_get_last_error(box, error_r);
+               *error_str_r = mailbox_get_last_internal_error(box, error_r);
                return -1;
        }
        return 0;
@@ -422,7 +422,7 @@ int mail_deliver_save(struct mail_deliver_context *ctx, const char *mailbox,
                pool_unref(&changes.pool);
        } else {
                mail_deliver_log(ctx, "save failed to %s: %s", mailbox_name,
-                       mail_storage_get_last_error(*storage_r, &error));
+                       mail_storage_get_last_internal_error(*storage_r, &error));
        }
 
        if (ctx->dest_mail == NULL)
index 8206269dfc5f286bc3c8f28c66921b8dffc74579..7c7e99b1119fd69f1496316cbf47bf66c9dd35b4 100644 (file)
@@ -559,7 +559,7 @@ rebuild_mailbox(struct mdbox_storage_rebuild_context *ctx,
        if (mailbox_open(box) < 0) {
                error = mailbox_get_last_mail_error(box);
                i_error("Couldn't open mailbox '%s': %s",
-                       vname, mailbox_get_last_error(box, NULL));
+                       vname, mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                if (error == MAIL_ERROR_TEMP)
                        return -1;
index 7e4e0c5a5af2ada770f1f6d0e8edea75e0369c6b..7c06c2c37164e7d18870af96f944543882c27834 100644 (file)
@@ -440,7 +440,7 @@ int index_mailbox_get_physical_size(struct mailbox *box,
                        const char *errstr;
                        enum mail_error error;
 
-                       errstr = mailbox_get_last_error(box, &error);
+                       errstr = mailbox_get_last_internal_error(box, &error);
                        if (error != MAIL_ERROR_EXPUNGED) {
                                i_error("Couldn't get size of mail UID %u in %s: %s",
                                        mail->uid, box->vname, errstr);
@@ -451,7 +451,7 @@ int index_mailbox_get_physical_size(struct mailbox *box,
        }
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("Listing mails in %s failed: %s",
-                       box->vname, mailbox_get_last_error(box, NULL));
+                       box->vname, mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        (void)mailbox_transaction_commit(&trans);
index b1f8333db920e916af426f8abfbfddfe1186d507..4edaba648b9bc3ec2446ba302edf4deb189b01c5 100644 (file)
@@ -153,7 +153,7 @@ mailbox_autoexpunge_set(struct mail_namespace *ns, const char *vname,
        if (mailbox_autoexpunge(box, autoexpunge, autoexpunge_max_mails) < 0) {
                i_error("Failed to autoexpunge mailbox '%s': %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
        }
        mailbox_free(&box);
 }
index a9206b2142bf80e6cb80bee064a9f88154e3361f..080018c42d09d5d17dc78e9032fc3f2386c6d120 100644 (file)
@@ -801,7 +801,7 @@ struct mailbox *mailbox_alloc_guid(struct mailbox_list *list,
                i_error("mailbox_alloc_guid(%s): "
                        "Couldn't verify mailbox GUID: %s",
                        guid_128_to_string(guid),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                vname = NULL;
                mailbox_free(&box);
        } else {
@@ -833,7 +833,7 @@ static int mailbox_autocreate(struct mailbox *box)
        enum mail_error error;
 
        if (mailbox_create(box, NULL, FALSE) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error != MAIL_ERROR_EXISTS) {
                        mail_storage_set_critical(box->storage,
                                "Failed to autocreate mailbox %s: %s",
@@ -846,7 +846,8 @@ static int mailbox_autocreate(struct mailbox *box)
                if (mailbox_set_subscribed(box, TRUE) < 0) {
                        mail_storage_set_critical(box->storage,
                                "Failed to autosubscribe to mailbox %s: %s",
-                               box->vname, mailbox_get_last_error(box, NULL));
+                               box->vname,
+                               mailbox_get_last_internal_error(box, NULL));
                        return -1;
                }
        }
@@ -867,7 +868,7 @@ static int mailbox_autocreate_and_reopen(struct mailbox *box)
                box->storage->user->inbox_open_error_logged = TRUE;
                mail_storage_set_critical(box->storage,
                        "Opening INBOX failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
        }
        return ret;
 }
@@ -1843,7 +1844,7 @@ int mailbox_sync_deinit(struct mailbox_sync_context **_ctx,
        ret = box->v.sync_deinit(ctx, status_r);
        if (ret < 0 && box->inbox_user &&
            !box->storage->user->inbox_open_error_logged) {
-               errormsg = mailbox_get_last_error(box, &error);
+               errormsg = mailbox_get_last_internal_error(box, &error);
                if (error == MAIL_ERROR_NOTPOSSIBLE) {
                        box->storage->user->inbox_open_error_logged = TRUE;
                        i_error("Syncing INBOX failed: %s", errormsg);
index d9b9e9799276296d6d9565a1d59973cb68c9ead6..fbfa45491544b00baf2ac6312369727593fadb89 100644 (file)
@@ -71,7 +71,7 @@ void mailbox_guid_cache_refresh(struct mailbox_list *list)
                if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID,
                                         &metadata) < 0) {
                        i_error("Couldn't get mailbox %s GUID: %s",
-                               info->vname, mailbox_get_last_error(box, NULL));
+                               info->vname, mailbox_get_last_internal_error(box, NULL));
                        list->guid_cache_errors = TRUE;
                } else if ((rec = hash_table_lookup(list->guid_cache,
                                (const uint8_t *)metadata.guid)) != NULL) {
index e8fafceddb6a4176baee8f510e3f7f0fd4dddcdf..457fa38b494461b3d27940a291f31e26158c7de1 100644 (file)
@@ -1004,7 +1004,7 @@ static int client_open_raw_mail(struct client *client, struct istream *input)
                                     (time_t)-1, client->state.mail_from,
                                     &box) < 0) {
                i_error("Can't open delivery mail as raw: %s",
-                       mailbox_get_last_error(box, &error));
+                       mailbox_get_last_internal_error(box, &error));
                mailbox_free(&box);
                client_rcpt_fail_all(client);
                return -1;
index 9631335d101e7523ed2ed2fc9b7131fc7506d7d7..6020ccfa9b20eb891e9ad55e2806378e0476fcef 100644 (file)
@@ -41,7 +41,7 @@ cmd_acl_mailbox_open(struct doveadm_mail_cmd_context *ctx,
                            MAILBOX_FLAG_READONLY | MAILBOX_FLAG_IGNORE_ACLS);
        if (mailbox_open(box) < 0) {
                i_error("Can't open mailbox %s: %s", mailbox,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_mailbox(ctx, box);
                mailbox_free(&box);
                return -1;
@@ -237,7 +237,7 @@ cmd_acl_set_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
                i_fatal_status(EX_USAGE, "%s", error);
        if ((ret = cmd_acl_mailbox_update(box, &update)) < 0) {
                i_error("Failed to set ACL: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_error(_ctx, MAIL_ERROR_TEMP);
        }
        mailbox_free(&box);
@@ -295,7 +295,7 @@ cmd_acl_delete_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
                i_fatal_status(EX_USAGE, "%s", error);
        if ((ret = cmd_acl_mailbox_update(box, &update)) < 0) {
                i_error("Failed to delete ACL: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                doveadm_mail_failed_error(ctx, MAIL_ERROR_TEMP);
        }
        mailbox_free(&box);
@@ -363,7 +363,7 @@ cmd_acl_debug_mailbox_open(struct doveadm_mail_cmd_context *ctx,
        box = mailbox_alloc(ns->list, mailbox,
                            MAILBOX_FLAG_READONLY | MAILBOX_FLAG_IGNORE_ACLS);
        if (mailbox_open(box) < 0) {
-               errstr = mail_storage_get_last_error(box->storage, &error);
+               errstr = mail_storage_get_last_internal_error(box->storage, &error);
                errstr = t_strdup(errstr);
                doveadm_mail_failed_error(ctx, error);
 
index 05d469e14c350b62ad7ccbeca0b973b328ea1833..336108c698d0ac6fe97d1fa158cb92d4d1ea19ad 100644 (file)
@@ -74,7 +74,7 @@ fts_lucene_get_mailbox_guid(struct mailbox *box, guid_128_t guid_r)
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID,
                                 &metadata) < 0) {
                i_error("lucene: Couldn't get mailbox %s GUID: %s",
-                       box->vname, mailbox_get_last_error(box, NULL));
+                       box->vname, mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        memcpy(guid_r, metadata.guid, GUID_128_SIZE);
index 02582ed6bdc0d277f3d41d741934bf99e97c894d..81ba0f909ef909253cf14f62f0143e2294b0fcb9 100644 (file)
@@ -750,7 +750,7 @@ rescan_open_mailbox(struct rescan_context *ctx, Document *doc)
                enum mail_error error;
                const char *errstr;
 
-               errstr = mailbox_get_last_error(ctx->box, &error);
+               errstr = mailbox_get_last_internal_error(ctx->box, &error);
                if (error == MAIL_ERROR_NOTFOUND)
                        ret = 0;
                else {
@@ -765,7 +765,7 @@ rescan_open_mailbox(struct rescan_context *ctx, Document *doc)
        if (mailbox_sync(ctx->box, (enum mailbox_sync_flags)0) < 0) {
                i_error("lucene: Failed to sync mailbox %s: %s",
                        mailbox_get_vname(ctx->box),
-                       mailbox_get_last_error(ctx->box, NULL));
+                       mailbox_get_last_internal_error(ctx->box, NULL));
                mailbox_free(&ctx->box);
                ctx->box_ret = -1;
                return -1;
index 4739ef70f8ab0c7db6ffa352bb94260396fcd137..8ce4cf83cd6b9f3cfcf3a18b0d01d6554003534e 100644 (file)
@@ -474,7 +474,7 @@ int fts_index_have_compatible_settings(struct mailbox_list *list,
        box = mailbox_alloc(list, vname, 0);
        if (mailbox_sync(box, (enum mailbox_sync_flags)0) < 0) {
                i_error("fts: Failed to sync mailbox %s: %s", vname,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        } else {
                ret = fts_index_get_header(box, &hdr) &&
index cd7136b7870cabc73ec0f92841b1e5d07416ffd4..3be7266e258f385c270dcd03bd9f84b1b5eea35e 100644 (file)
@@ -473,7 +473,7 @@ fts_build_mail_real(struct fts_backend_update_context *update_ctx,
                        return 0;
                i_error("Failed to read mailbox %s mail UID=%u stream: %s",
                        mailbox_get_vname(mail->box), mail->uid,
-                       mailbox_get_last_error(mail->box, NULL));
+                       mailbox_get_last_internal_error(mail->box, NULL));
                return -1;
        }
 
index d7d29e2552fb8010c64af7222e8e73f644a73689..b7dd0e297b0958460874e61163dd951c2f257df6 100644 (file)
@@ -124,7 +124,7 @@ mailbox_open_or_create(struct mailbox_list *list, struct mailbox *src_box,
                return box;
        }
 
-       *error_r = mailbox_get_last_error(box, &error);
+       *error_r = mailbox_get_last_internal_error(box, &error);
        if (error != MAIL_ERROR_NOTFOUND) {
                *error_r = t_strdup_printf("Failed to open mailbox %s: %s",
                                           name, *error_r);
@@ -136,13 +136,13 @@ mailbox_open_or_create(struct mailbox_list *list, struct mailbox *src_box,
        if (mailbox_create(box, NULL, FALSE) < 0 &&
            mailbox_get_last_mail_error(box) != MAIL_ERROR_EXISTS) {
                *error_r = t_strdup_printf("Failed to create mailbox %s: %s", name,
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                return NULL;
        }
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("Failed to open created mailbox %s: %s", name,
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                mailbox_free(&box);
                return NULL;
        }
@@ -183,7 +183,7 @@ static int lazy_expunge_mail_is_last_instace(struct mail *_mail)
        enum mail_error error;
 
        if (mail_get_special(_mail, MAIL_FETCH_REFCOUNT, &value) < 0) {
-               errstr = mailbox_get_last_error(_mail->box, &error);
+               errstr = mailbox_get_last_internal_error(_mail->box, &error);
                if (error == MAIL_ERROR_EXPUNGED) {
                        /* already expunged - just ignore it */
                        return 0;
@@ -208,7 +208,7 @@ static int lazy_expunge_mail_is_last_instace(struct mail *_mail)
                   see the same refcount, so we need to adjust the refcount
                   by tracking the expunged message GUIDs. */
                if (mail_get_special(_mail, MAIL_FETCH_GUID, &value) < 0) {
-                       errstr = mailbox_get_last_error(_mail->box, &error);
+                       errstr = mailbox_get_last_internal_error(_mail->box, &error);
                        if (error == MAIL_ERROR_EXPUNGED) {
                                /* already expunged - just ignore it */
                                return 0;
index b2f358ca429f95ec65dcfe31417c9ce77354c0ae..a3a5b003d63b2638c12f7b13235fc21209b855db 100644 (file)
@@ -367,7 +367,7 @@ static int mcp_keypair_generate_run(struct doveadm_mail_cmd_context *_ctx,
                        res->name = p_strdup(_ctx->pool, info->vname);
                        res->success = FALSE;
                        res->error = p_strdup(_ctx->pool,
-                                          mailbox_get_last_error(box, NULL));
+                                       mailbox_get_last_internal_error(box, NULL));
                } else if ((ret = mcp_keypair_generate(ctx, user_key, box,
                                                        &pair, &pubid,
                                                        &error)) < 0) {
@@ -458,7 +458,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx,
                if (mailbox_open(box) < 0) {
                        i_error("mailbox_open(%s) failed: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        mailbox_free(&box);
                        return;
                }
@@ -472,7 +472,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx,
                        i_error("mailbox_get_attribute(%s, %s) failed: %s",
                                mailbox_get_vname(box),
                                USER_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                }
 
                iter = mailbox_attribute_iter_init(box,
@@ -494,7 +494,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx,
                if (mailbox_attribute_iter_deinit(&iter) < 0)
                        i_error("mailbox_attribute_iter_deinit(%s) failed: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
 
                (void)mailbox_transaction_commit(&t);
 
@@ -522,7 +522,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx,
                if (mailbox_open(box) < 0) {
                        i_error("mailbox_open(%s) failed: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        mailbox_free(&box);
                        continue;
                }
@@ -541,7 +541,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx,
                        i_error("mailbox_get_attribute(%s, %s) failed: %s",
                                mailbox_get_vname(box),
                                BOX_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                } else if ((ret = mail_crypt_box_get_pvt_digests(box, pool_datastack_create(),
                                                                 MAIL_ATTRIBUTE_TYPE_PRIVATE,
                                                                 &ids, &error)) < 0) {
@@ -726,7 +726,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
        if (mailbox_open(box) < 0) {
                doveadm_print(t_strdup_printf("mailbox_open(%s) failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL)));
+                       mailbox_get_last_internal_error(box, NULL)));
                _ctx->exit_code = EX_TEMPFAIL;
                return -1;
        }
@@ -757,7 +757,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
                                                 attr, &value)) < 0) {
                        doveadm_print(t_strdup_printf("mailbox_attribute_get(%s, %s) failed: %s",
                                mailbox_get_vname(box), attr,
-                               mailbox_get_last_error(box, NULL)));
+                               mailbox_get_last_internal_error(box, NULL)));
                        _ctx->exit_code = EX_TEMPFAIL;
                        break;
                } else if (ret > 0) {
@@ -816,7 +816,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
                                doveadm_print(t_strdup_printf("mailbox_attribute_set(%s, %s) failed: %s",
                                        mailbox_get_vname(box),
                                        raw_key->attr,
-                                       mailbox_get_last_error(box, NULL)));
+                                       mailbox_get_last_internal_error(box, NULL)));
                                _ctx->exit_code = EX_TEMPFAIL;
                                ret = -1;
                                break;
@@ -831,7 +831,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
                if (mailbox_transaction_commit(&t) < 0) {
                        doveadm_print(t_strdup_printf("mailbox_transaction_commit(%s) failed: %s",
                                mailbox_get_vname(box),
-                               mailbox_get_last_error(box, NULL)));
+                               mailbox_get_last_internal_error(box, NULL)));
                } else {
                        doveadm_print(t_strdup_printf("Changed password for %u key(s)",
                                                     count));
index 8c3604873802281875017f0ff71f3b06283eff8a..c81c52b985b5f988a490fb7395a3efaf46eb98e4 100644 (file)
@@ -116,7 +116,7 @@ mail_crypt_acl_unset_private_keys(struct mailbox *src_box,
                *error_r = t_strdup_printf("mail-crypt-acl-plugin: "
                                           "mailbox_transaction_commit(%s) failed: %s",
                                           mailbox_get_vname(src_box),
-                                          mailbox_get_last_error(src_box, NULL));
+                                          mailbox_get_last_internal_error(src_box, NULL));
                return -1;
        }
        return 0;
@@ -213,7 +213,7 @@ mail_crypt_acl_update_private_key(struct mailbox *src_box,
        }
 
        if (mailbox_transaction_commit(&t) < 0) {
-               *error_r = mailbox_get_last_error(src_box, NULL);
+               *error_r = mailbox_get_last_internal_error(src_box, NULL);
                ret = -1;
        }
 
@@ -247,7 +247,7 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
                i_error("mail-crypt-acl-plugin: "
                        "mailbox_open(%s) failed: %s",
                        mailbox_get_vname(box),
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
index 0dc3e7de7f9955acba82552c1bac26e0391cb876..7d38ea74179c6367a12327c46c2de9e85c238396 100644 (file)
@@ -322,7 +322,7 @@ int mail_crypt_get_private_key(struct mailbox_transaction_context *t,
                                                   shared ? "/shared/" :
                                                            "/priv/",
                                                   attr_name,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
                return ret;
        }
@@ -354,7 +354,7 @@ int mail_crypt_user_get_private_key(struct mail_user *user, const char *pubid,
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("mailbox_open(%s) failed: %s",
                                           "INBOX",
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
@@ -369,7 +369,7 @@ int mail_crypt_user_get_private_key(struct mail_user *user, const char *pubid,
                                *error_r = t_strdup_printf("mailbox_attribute_get(%s, /shared/%s) failed: %s",
                                                           mailbox_get_vname(box),
                                                           USER_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                          mailbox_get_last_error(box, NULL));
+                                                          mailbox_get_last_internal_error(box, NULL));
                        }
                } else {
                        pubid = value.value;
@@ -402,7 +402,7 @@ int mail_crypt_box_get_private_key(struct mailbox_transaction_context *t,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, /shared/%s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   USER_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
                return ret;
        }
@@ -461,7 +461,7 @@ int mail_crypt_set_private_key(struct mailbox_transaction_context *t,
                           mailbox_get_vname(mailbox_transaction_get_mailbox(t)),
                           shared ? "/shared" : "/priv",
                           attr_name,
-                          mailbox_get_last_error(
+                          mailbox_get_last_internal_error(
                                mailbox_transaction_get_mailbox(t), NULL));
        }
 
@@ -503,7 +503,7 @@ int mail_crypt_user_set_private_key(struct mail_user *user, const char *pubid,
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("mailbox_open(%s) failed: %s",
                                           "INBOX",
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
@@ -515,7 +515,7 @@ int mail_crypt_user_set_private_key(struct mail_user *user, const char *pubid,
        } else if ((ret = mailbox_transaction_commit(&t)) < 0) {
                *error_r = t_strdup_printf("mailbox_transaction_commit(%s) failed: %s",
                                          mailbox_get_vname(box),
-                                         mailbox_get_last_error(box, NULL));
+                                         mailbox_get_last_internal_error(box, NULL));
        }
 
        mailbox_free(&box);
@@ -538,7 +538,7 @@ int mail_crypt_box_set_private_key(struct mailbox *box, const char *pubid,
        } else if ((ret = mailbox_transaction_commit(&t)) < 0) {
                *error_r = t_strdup_printf("mailbox_transaction_commit(%s) failed: %s",
                                          mailbox_get_vname(box),
-                                         mailbox_get_last_error(box, NULL));
+                                         mailbox_get_last_internal_error(box, NULL));
        }
 
        return ret;
@@ -573,7 +573,7 @@ int mail_crypt_get_public_key(struct mailbox_transaction_context *t,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, %s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   attr_name,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
                return ret;
        }
@@ -629,7 +629,7 @@ int mail_crypt_user_get_public_key(struct mail_user *user,
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("mailbox_open(%s) failed: %s",
                                           "INBOX",
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
@@ -643,7 +643,7 @@ int mail_crypt_user_get_public_key(struct mail_user *user,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, /shared/%s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   USER_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
        } else {
                ret = mail_crypt_get_public_key(t, value.value, TRUE, key_r, error_r);
@@ -669,7 +669,7 @@ int mail_crypt_box_get_public_key(struct mailbox_transaction_context *t,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, /shared/%s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   BOX_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
                return ret;
        }
@@ -705,7 +705,7 @@ int mail_crypt_set_public_key(struct mailbox_transaction_context *t,
                           mailbox_get_vname(mailbox_transaction_get_mailbox(t)),
                           "/shared",
                           attr_name,
-                          mailbox_get_last_error(
+                          mailbox_get_last_internal_error(
                                mailbox_transaction_get_mailbox(t), NULL));
                return -1;
        }
@@ -728,7 +728,7 @@ int mail_crypt_user_set_public_key(struct mail_user *user, const char *pubid,
        if (mailbox_open(box) < 0) {
                *error_r = t_strdup_printf("mailbox_open(%s) failed: %s",
                                           "INBOX",
-                                          mailbox_get_last_error(box, NULL));
+                                          mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
 
@@ -746,7 +746,7 @@ int mail_crypt_user_set_public_key(struct mail_user *user, const char *pubid,
                        *error_r = t_strdup_printf("mailbox_attribute_set(%s, /shared/%s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   USER_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
        }
 
@@ -755,7 +755,7 @@ int mail_crypt_user_set_public_key(struct mail_user *user, const char *pubid,
        } else if (mailbox_transaction_commit(&t) < 0) {
                *error_r = t_strdup_printf("mailbox_transaction_commit(%s) failed: %s",
                                          mailbox_get_vname(box),
-                                         mailbox_get_last_error(box, NULL));
+                                         mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
 
@@ -785,7 +785,7 @@ int mail_crypt_box_set_public_key(struct mailbox *box, const char *pubid,
                        *error_r = t_strdup_printf("mailbox_attribute_set(%s, /shared/%s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   BOX_CRYPT_PREFIX ACTIVE_KEY_NAME,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
        }
 
@@ -794,7 +794,7 @@ int mail_crypt_box_set_public_key(struct mailbox *box, const char *pubid,
        } else if (mailbox_transaction_commit(&t) < 0) {
                *error_r = t_strdup_printf("mailbox_transaction_commit(%s) failed: %s",
                                          mailbox_get_vname(box),
-                                         mailbox_get_last_error(box, NULL));
+                                         mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
 
@@ -866,7 +866,7 @@ int mail_crypt_box_get_shared_key(struct mailbox_transaction_context *t,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, %s) failed: %s",
                                                mailbox_get_vname(box),
                                                attr_name,
-                                               mailbox_get_last_error(box, NULL));
+                                               mailbox_get_last_internal_error(box, NULL));
                        return ret;
                }
                return mail_crypt_get_private_key(t, pubid, FALSE, TRUE, key_r,
@@ -931,7 +931,7 @@ int mail_crypt_box_set_shared_key(struct mailbox_transaction_context *t,
                                           mailbox_get_vname(
                                                mailbox_transaction_get_mailbox(t)),
                                           attr_name,
-                                          mailbox_get_last_error(
+                                          mailbox_get_last_internal_error(
                                                mailbox_transaction_get_mailbox(t),
                                                NULL));
        }
@@ -965,7 +965,7 @@ int mail_crypt_box_unset_shared_key(struct mailbox_transaction_context *t,
                                                    mailbox_get_vname(
                                                    mailbox_transaction_get_mailbox(t)),
                                                    attr_name,
-                                                   mailbox_get_last_error(
+                                                   mailbox_get_last_internal_error(
                                                    mailbox_transaction_get_mailbox(t),
                                                    NULL));
                }
@@ -1094,7 +1094,7 @@ int mail_crypt_box_get_pvt_digests(struct mailbox *box, pool_t pool,
        }
        ret = mailbox_attribute_iter_deinit(&iter);
        if (ret < 0)
-               *error_r = mailbox_get_last_error(box, NULL);
+               *error_r = mailbox_get_last_internal_error(box, NULL);
        return ret;
 }
 
@@ -1121,7 +1121,7 @@ int mail_crypt_box_get_private_keys(struct mailbox_transaction_context *t,
 
        ret = mailbox_attribute_iter_deinit(&iter);
        if (ret < 0)
-               *error_r = mailbox_get_last_error(box, NULL);
+               *error_r = mailbox_get_last_internal_error(box, NULL);
        return ret;
 }
 
index a2299c0c0ee4490c2699c65d4c055404e36dd90a..620f5ba3f4101eb20c0de93324654e4ed81c0b1e 100644 (file)
@@ -78,7 +78,7 @@ int test_mail_attribute_get(struct mailbox *box, bool user_key, bool shared,
                        *error_r = t_strdup_printf("mailbox_attribute_get(%s, %s) failed: %s",
                                                   mailbox_get_vname(box),
                                                   attr_name,
-                                                  mailbox_get_last_error(box, NULL));
+                                                  mailbox_get_last_internal_error(box, NULL));
                }
        } else {
                *value_r = t_strdup(value.value);
@@ -123,8 +123,7 @@ test_mail_attribute_set(struct mailbox_transaction_context *t,
                *error_r = t_strdup_printf("mailbox_attribute_set(%s, %s) failed: %s",
                                           mailbox_get_vname(mailbox_transaction_get_mailbox(t)),
                                           attr_name,
-                                          mailbox_get_last_error(mailbox_transaction_get_mailbox(t), NULL));
-
+                                          mailbox_get_last_internal_error(mailbox_transaction_get_mailbox(t), NULL));
        }
 
        return ret;
@@ -252,7 +251,7 @@ static void test_generate_inbox_key(void)
                                            MAILBOX_FLAG_READONLY);
        if (mailbox_open(box) < 0)
                i_fatal("mailbox_open(INBOX) failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
        if (mail_crypt_box_generate_keypair(box, &pair, user_key, &pubid,
                                            &error) < 0) {
                i_error("generate_keypair failed: %s", error);
@@ -313,7 +312,7 @@ static void test_verify_keys(void)
                                            MAILBOX_FLAG_READONLY);
        if (mailbox_open(box) < 0)
                i_fatal("mailbox_open(INBOX) failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
        /* verify links */
 
        /* user's public key */
@@ -410,7 +409,7 @@ static void test_old_key(void)
                                            MAILBOX_FLAG_READONLY);
        if (mailbox_open(box) < 0)
                i_fatal("mailbox_open(INBOX) failed: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
 
        struct mailbox_transaction_context *t = mailbox_transaction_begin(box, 0);
 
index 34bc85f06596edf64261c489fd49010315485359..4197afd64b2f0d711eb023a5e125e5c9d23e68c5 100644 (file)
@@ -237,7 +237,7 @@ get_hdr_sha1(struct mail *mail, unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN
        int ret;
 
        if (mail_get_hdr_stream(mail, NULL, &input) < 0) {
-               errstr = mailbox_get_last_error(mail->box, &error);
+               errstr = mailbox_get_last_internal_error(mail->box, &error);
                i_error("pop3_migration: Failed to get header for msg %u: %s",
                        mail->seq, errstr);
                return error == MAIL_ERROR_EXPUNGED ? 0 : -1;
@@ -272,7 +272,7 @@ get_hdr_sha1(struct mail *mail, unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN
           (and/or RETR) and we'll parse the header ourself from it. This
           should work around any similar bugs in all IMAP/POP3 servers. */
        if (mail_get_stream_because(mail, NULL, NULL, "pop3-migration", &input) < 0) {
-               errstr = mailbox_get_last_error(mail->box, &error);
+               errstr = mailbox_get_last_internal_error(mail->box, &error);
                i_error("pop3_migration: Failed to get body for msg %u: %s",
                        mail->seq, errstr);
                return error == MAIL_ERROR_EXPUNGED ? 0 : -1;
@@ -342,7 +342,7 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box)
 
        if (mailbox_sync(pop3_box, 0) < 0) {
                i_error("pop3_migration: Couldn't sync mailbox %s: %s",
-                       pop3_box->vname, mailbox_get_last_error(pop3_box, NULL));
+                       pop3_box->vname, mailbox_get_last_internal_error(pop3_box, NULL));
                return -1;
        }
 
@@ -363,7 +363,7 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box)
                else if (mail_get_physical_size(mail, &size) < 0) {
                        i_error("pop3_migration: Failed to get size for msg %u: %s",
                                mail->seq,
-                               mailbox_get_last_error(pop3_box, NULL));
+                               mailbox_get_last_internal_error(pop3_box, NULL));
                        ret = -1;
                        break;
                }
@@ -372,7 +372,7 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box)
                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,
-                               mailbox_get_last_error(pop3_box, NULL));
+                               mailbox_get_last_internal_error(pop3_box, NULL));
                        ret = -1;
                        break;
                }
@@ -390,7 +390,7 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box)
 
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("pop3_migration: Failed to search all POP3 mails: %s",
-                       mailbox_get_last_error(pop3_box, NULL));
+                       mailbox_get_last_internal_error(pop3_box, NULL));
                ret = -1;
        }
        (void)mailbox_transaction_commit(&t);
@@ -419,7 +419,7 @@ pop3_map_read_cached_hdr_hashes(struct mailbox_transaction_context *t,
 
        if (mailbox_search_deinit(&ctx) < 0) {
                i_warning("pop3_migration: Failed to search all cached POP3 header hashes: %s - ignoring",
-                         mailbox_get_last_error(t->box, NULL));
+                         mailbox_get_last_internal_error(t->box, NULL));
        }
 }
 
@@ -475,7 +475,7 @@ map_read_hdr_hashes(struct mailbox *box, struct array *msg_map, uint32_t seq1)
 
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("pop3_migration: Failed to search all mail headers: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        (void)mailbox_transaction_commit(&t);
@@ -539,7 +539,7 @@ static int imap_map_read(struct mailbox *box)
                else if (mail_get_physical_size(mail, &psize) < 0) {
                        i_error("pop3_migration: Failed to get psize for imap uid %u: %s",
                                mail->uid,
-                               mailbox_get_last_error(box, NULL));
+                               mailbox_get_last_internal_error(box, NULL));
                        ret = -1;
                        break;
                }
@@ -551,7 +551,7 @@ static int imap_map_read(struct mailbox *box)
 
        if (mailbox_search_deinit(&ctx) < 0) {
                i_error("pop3_migration: Failed to search all IMAP mails: %s",
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                ret = -1;
        }
        (void)mailbox_transaction_commit(&t);
index 065a3af238c2871efd722458cef18a8dfe9d7635..fff48495a42a4cdc0e197c7bff4a535b332bf45a 100644 (file)
@@ -164,7 +164,7 @@ static const char *push_notification_driver_ox_get_metadata
         inbox = mailbox_alloc(ns->list, "INBOX", MAILBOX_FLAG_READONLY);
         if (mailbox_open(inbox) < 0) {
             i_error(OX_LOG_LABEL "Skipped because unable to open INBOX: %s",
-                    mailbox_get_last_error(inbox, NULL));
+                    mailbox_get_last_internal_error(inbox, NULL));
         } else {
             mctx = mailbox_transaction_begin(inbox, 0);
         }
@@ -175,7 +175,7 @@ static const char *push_notification_driver_ox_get_metadata
                                     OX_METADATA_KEY, &attr);
         if (ret < 0) {
             i_error(OX_LOG_LABEL "Skipped because unable to get attribute: %s",
-                    mailbox_get_last_error(inbox, NULL));
+                    mailbox_get_last_internal_error(inbox, NULL));
         } else if (ret == 0) {
             push_notification_driver_debug(OX_LOG_LABEL, dtxn->ptxn->muser,
                                            "Skipped because not active (/private/"OX_METADATA_KEY" METADATA not set)");
@@ -185,7 +185,7 @@ static const char *push_notification_driver_ox_get_metadata
 
         if (!use_existing_txn && (mailbox_transaction_commit(&mctx) < 0)) {
             i_error(OX_LOG_LABEL "Transaction commit failed: %s",
-                    mailbox_get_last_error(inbox, NULL));
+                    mailbox_get_last_internal_error(inbox, NULL));
             /* the commit doesn't matter though. */
         }
     }
@@ -327,7 +327,7 @@ static int push_notification_driver_ox_get_mailbox_status
     /* open and sync new instance of the same mailbox to get most recent status */
     box = mailbox_alloc(mailbox_get_namespace(mbox)->list, mailbox_get_name(mbox), MAILBOX_FLAG_READONLY);
     if (mailbox_sync(box, 0) < 0) {
-        i_error("mailbox_sync(%s) failed: %s", mailbox_get_vname(mbox), mailbox_get_last_error(box, NULL));
+        i_error("mailbox_sync(%s) failed: %s", mailbox_get_vname(mbox), mailbox_get_last_internal_error(box, NULL));
         ret = -1;
     } else {
         /* only 'unseen' is needed at the moment */
index ce60e4990010ba50eddde0fea331c56b7677c97b..d031f0209a7cdbc0a800fcd4123a580e03c521cf 100644 (file)
@@ -29,7 +29,7 @@ static void push_notification_event_mailboxcreate_event(
     if (mailbox_get_status(ptxn->mbox, STATUS_UIDVALIDITY, &status) < 0) {
         i_error(EVENT_NAME "Failed to get created mailbox '%s' uidvalidity: %s",
                 mailbox_get_vname(ptxn->mbox),
-                mailbox_get_last_error(ptxn->mbox, NULL));
+                mailbox_get_last_internal_error(ptxn->mbox, NULL));
         status.uidvalidity = 0;
     }
 
index dd1f98206c86988a4ecd9620ba8e78f4a2cc10b9..9410b69099f83a13be2b47b409b2a602fc8b8c01 100644 (file)
@@ -50,7 +50,7 @@ quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
                                        MAILBOX_METADATA_PHYSICAL_SIZE,
                                        &metadata) < 0 ||
            mailbox_get_status(box, STATUS_MESSAGES, &status) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error == MAIL_ERROR_TEMP) {
                        i_error("quota: Couldn't get size of mailbox %s: %s",
                                vname, errstr);
@@ -252,7 +252,7 @@ static int quota_count_recalculate_box(struct mailbox *box)
        enum mail_error error;
 
        if (mailbox_open(box) < 0) {
-               errstr = mailbox_get_last_error(box, &error);
+               errstr = mailbox_get_last_internal_error(box, &error);
                if (error != MAIL_ERROR_TEMP) {
                        /* non-temporary error, e.g. ACLs denied access. */
                        return 0;
@@ -273,13 +273,13 @@ static int quota_count_recalculate_box(struct mailbox *box)
        if (mailbox_get_metadata(box, MAILBOX_METADATA_VIRTUAL_SIZE,
                                 &metadata) < 0) {
                i_error("Couldn't get mailbox %s vsize: %s", box->vname,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        /* call sync to write the change to mailbox list index */
        if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FAST) < 0) {
                i_error("Couldn't sync mailbox %s: %s", box->vname,
-                       mailbox_get_last_error(box, NULL));
+                       mailbox_get_last_internal_error(box, NULL));
                return -1;
        }
        return 0;
index 068185921b0d7fbe996e7ab90c6ca31d9873abd9..19aeaf26d688c3658561ad27824ec36295c72f91 100644 (file)
@@ -1195,7 +1195,7 @@ enum quota_alloc_result quota_try_alloc(struct quota_transaction_context *ctx,
 
        if (mail_get_physical_size(mail, &size) < 0) {
                enum mail_error error;
-               const char *errstr = mailbox_get_last_error(mail->box, &error);
+               const char *errstr = mailbox_get_last_internal_error(mail->box, &error);
 
                if (error == MAIL_ERROR_EXPUNGED) {
                        /* mail being copied was already expunged. it'll fail,
index 27362a8b36056b0ed9632e53c5f9fbe62b02835d..7c7018e0b17adb6808836228c3880e2aa32f2f6c 100644 (file)
@@ -247,7 +247,7 @@ static int init_pop3_deleted_flag(struct client *client, const char **error_r)
                *error_r = t_strdup_printf(
                        "pop3_deleted_flags: Invalid keyword '%s': %s",
                        client->set->pop3_deleted_flag,
-                       mailbox_get_last_error(client->mailbox, NULL));
+                       mailbox_get_last_internal_error(client->mailbox, NULL));
                return -1;
        }
        return 0;
@@ -277,7 +277,7 @@ static int init_mailbox(struct client *client, const char **error_r)
        }
 
        if (ret < 0) {
-               *error_r = mailbox_get_last_error(client->mailbox, NULL);
+               *error_r = mailbox_get_last_internal_error(client->mailbox, NULL);
                client_send_storage_error(client);
        } else {
                if (failed_uid == last_failed_uid && failed_uid != 0) {
@@ -467,7 +467,7 @@ int client_init_mailbox(struct client *client, const char **error_r)
        client->mailbox = mailbox_alloc(client->inbox_ns->list, "INBOX", flags);
        if (mailbox_open(client->mailbox) < 0) {
                *error_r = t_strdup_printf("Couldn't open INBOX: %s",
-                       mailbox_get_last_error(client->mailbox, NULL));
+                       mailbox_get_last_internal_error(client->mailbox, NULL));
                client_send_storage_error(client);
                return -1;
        }
index 05b1a30398ab7a979fd70442ee5d9b276df0879f..945961f59aaae45b49de034134a845fb469b05cb 100644 (file)
@@ -611,7 +611,7 @@ pop3_get_uid(struct client *client, struct mail *mail, string_t *str,
                if (mail_get_special(mail, MAIL_FETCH_HEADER_MD5,
                                     &tab[2].value) < 0) {
                        i_error("UIDL: Header MD5 lookup failed: %s",
-                               mailbox_get_last_error(mail->box, NULL));
+                               mailbox_get_last_internal_error(mail->box, NULL));
                        return -1;
                } else if (*tab[2].value == '\0') {
                        i_error("UIDL: Header MD5 not found "
@@ -623,7 +623,7 @@ pop3_get_uid(struct client *client, struct mail *mail, string_t *str,
                if (mail_get_special(mail, MAIL_FETCH_STORAGE_ID,
                                     &tab[3].value) < 0) {
                        i_error("UIDL: File name lookup failed: %s",
-                               mailbox_get_last_error(mail->box, NULL));
+                               mailbox_get_last_internal_error(mail->box, NULL));
                        return -1;
                } else if (*tab[3].value == '\0') {
                        i_error("UIDL: File name not found "
@@ -635,7 +635,7 @@ pop3_get_uid(struct client *client, struct mail *mail, string_t *str,
                if (mail_get_special(mail, MAIL_FETCH_GUID,
                                     &tab[4].value) < 0) {
                        i_error("UIDL: Message GUID lookup failed: %s",
-                               mailbox_get_last_error(mail->box, NULL));
+                               mailbox_get_last_internal_error(mail->box, NULL));
                        return -1;
                } else if (*tab[4].value == '\0') {
                        i_error("UIDL: Message GUID not found "