From: Timo Sirainen <tss@iki.fi>
Date: Tue, 4 Sep 2012 11:56:13 +0000 (+0300)
Subject: quota: Removed quota_ignore_save_errors setting and made it enabled always.
X-Git-Tag: 2.2.alpha1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74b0ef7d147bda1e8a2f7b0e9ff0041ab58e2eba;p=thirdparty%2Fdovecot%2Fcore.git

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 149dca8e65..289592fde0 100644
--- 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 1ee2d46e11..998aa6d64c 100644
--- 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 fd761f5733..85a6d3ca6e 100644
--- 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;