dovecot-2.2: quota: Removed quota_ignore_save_errors setting and...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Sep 4 14:56:24 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/cf6f14ec3937
changeset: 15016:cf6f14ec3937
user: Timo Sirainen <tss at iki.fi>
date: Tue Sep 04 14:56:13 2012 +0300
description:
quota: Removed quota_ignore_save_errors setting and made it enabled always.
diffstat:
src/plugins/quota/quota-private.h | 1 -
src/plugins/quota/quota-storage.c | 6 +++---
src/plugins/quota/quota.c | 2 --
3 files changed, 3 insertions(+), 6 deletions(-)
diffs (46 lines):
diff -r dbaa7f5f82cd -r cf6f14ec3937 src/plugins/quota/quota-private.h
--- a/src/plugins/quota/quota-private.h Mon Sep 03 13:20:32 2012 +0300
+++ b/src/plugins/quota/quota-private.h Tue Sep 04 14:56:13 2012 +0300
@@ -25,7 +25,6 @@
uoff_t size, bool *too_large_r);
const char *quota_exceeded_msg;
- unsigned int ignore_save_errors:1;
unsigned int debug:1;
};
diff -r dbaa7f5f82cd -r cf6f14ec3937 src/plugins/quota/quota-storage.c
--- a/src/plugins/quota/quota-storage.c Mon Sep 03 13:20:32 2012 +0300
+++ b/src/plugins/quota/quota-storage.c Tue Sep 04 14:56:13 2012 +0300
@@ -147,7 +147,8 @@
} 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 @@
} 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 -r dbaa7f5f82cd -r cf6f14ec3937 src/plugins/quota/quota.c
--- a/src/plugins/quota/quota.c Mon Sep 03 13:20:32 2012 +0300
+++ b/src/plugins/quota/quota.c Tue Sep 04 14:56:13 2012 +0300
@@ -195,8 +195,6 @@
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;
More information about the dovecot-cvs
mailing list