quota: Removed quota_ignore_save_errors setting and made it enabled always.

diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index 149dca8e65b965b962cbb1a3a921a81b085c8d00..289592fde0e7a136fc986ab87ddfacbdef352f9e 100644 (file)
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -25,7 +25,6 @@ struct quota_settings {
                          uoff_t size, bool *too_large_r);
 
        const char *quota_exceeded_msg;
-       unsigned int ignore_save_errors:1;
        unsigned int debug:1;
 };
 

diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index 1ee2d46e112b1b4af3a10e20bbb4b7b14e8e388e..998aa6d64c183a42d42a9587fa102cb35fe0ac73 100644 (file)
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -147,7 +147,8 @@ static int quota_check(struct mailbox_transaction_context *t, struct mail *mail)
        } else {
                mail_storage_set_critical(t->box->storage,
                                          "Internal quota calculation error");
-               return qt->quota->set->ignore_save_errors ? 0 : -1;
+               /* allow saving anyway */
+               return 0;
        }
 }
 
@@ -213,8 +214,7 @@ quota_save_begin(struct mail_save_context *ctx, struct istream *input)
                } else if (ret < 0) {
                        mail_storage_set_critical(t->box->storage,
                                "Internal quota calculation error");
-                       if (!qt->quota->set->ignore_save_errors)
-                               return -1;
+                       /* allow saving anyway */
                }
        }
 

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index fd761f5733dbc72ca4d2dee291be348f67a1aae6..85a6d3ca6e99bbb2d3abf4e3469427ff4f741964 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -195,8 +195,6 @@ int quota_user_read_settings(struct mail_user *user,
        quota_set->debug = user->mail_debug;
        quota_set->quota_exceeded_msg =
                mail_user_plugin_getenv(user, "quota_exceeded_message");
-       quota_set->ignore_save_errors =
-               mail_user_plugin_getenv(user, "quota_ignore_save_errors") != NULL;
        if (quota_set->quota_exceeded_msg == NULL)
                quota_set->quota_exceeded_msg = DEFAULT_QUOTA_EXCEEDED_MSG;