quota: Fixed handling when mail size lookup fails due to mail already being expunged.

We don't want to fail it as a quota allocation failure, but just pass
through the "mail is expunged" error to the original caller.

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 6288302f045c216f0205890635703f17ff962ab3..80bf60065dfa42f6011d9f87b5aa2746b1e7930c 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -1110,9 +1110,16 @@ int quota_try_alloc(struct quota_transaction_context *ctx,
                return 1;
 
        if (mail_get_physical_size(mail, &size) < 0) {
+               enum mail_error error;
+               const char *errstr = mailbox_get_last_error(mail->box, &error);
+
+               if (error == MAIL_ERROR_EXPUNGED) {
+                       /* mail being copied was already expunged. it'll fail,
+                          so just return success for the quota allocated. */
+                       return 1;
+               }
                i_error("quota: Failed to get mail size (box=%s, uid=%u): %s",
-                       mail->box->vname, mail->uid,
-                       mailbox_get_last_error(mail->box, NULL));
+                       mail->box->vname, mail->uid, errstr);
                return -1;
        }