--- a/src.quota-no-check Wed Apr 13 12:23:23 2011 +0200
+++ b/src.quota-no-check Tue May 17 16:14:22 2011 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent 124a35dbf1399ba64efa3391306e18d9971d3d8b
+# Parent 094efc6f5bac18d49a1b5873257b0e729241dc55
-diff -r 124a35dbf139 doc/spec.txt
---- a/doc/spec.txt Wed Apr 13 12:08:14 2011 +0200
-+++ b/doc/spec.txt Wed Apr 13 12:08:31 2011 +0200
-@@ -18340,6 +18340,9 @@
+diff -r 094efc6f5bac doc/spec.txt
+--- a/doc/spec.txt Tue May 17 15:50:31 2011 +0200
++++ b/doc/spec.txt Tue May 17 15:55:42 2011 +0200
+@@ -18902,6 +18902,9 @@
large file support (Linux and FreeBSD have this), mailboxes larger than 2G can
be handled.
@@ -14,19 +14,19 @@
Note: A value of zero is interpreted as "no quota".
The expansion happens while Exim is running as root, before it changes uid for
-@@ -18378,6 +18381,9 @@
+@@ -18940,6 +18943,9 @@
failure causes delivery to be deferred. A value of zero is interpreted as "no
quota".
+If there is "/no_check" appended, then quota updating is done as usual, but the
+over quota condition does not prevent the delivery.
+
- +--------------------------------------------------------------+
+ +------------------+---------------+-------------+-------------+
|quota_is_inclusive|Use: appendfile|Type: boolean|Default: true|
- +--------------------------------------------------------------+
-diff -r 124a35dbf139 src/transports/appendfile.c
---- a/src/transports/appendfile.c Wed Apr 13 12:08:14 2011 +0200
-+++ b/src/transports/appendfile.c Wed Apr 13 12:08:31 2011 +0200
+ +------------------+---------------+-------------+-------------+
+diff -r 094efc6f5bac src/transports/appendfile.c
+--- a/src/transports/appendfile.c Tue May 17 15:50:31 2011 +0200
++++ b/src/transports/appendfile.c Tue May 17 15:55:42 2011 +0200
@@ -236,7 +236,9 @@
FALSE, /* mailstore_format */
FALSE, /* mbx_format */
@@ -97,7 +97,7 @@
ob->quota_warn_threshold_value,
ob->quota_warn_threshold_is_percent? "%" : "",
isdirectory? "directory" : "file",
-@@ -2748,18 +2764,31 @@
+@@ -2751,18 +2767,31 @@
}
if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value)
{
@@ -139,9 +139,9 @@
}
}
-diff -r 124a35dbf139 src/transports/appendfile.h
---- a/src/transports/appendfile.h Wed Apr 13 12:08:14 2011 +0200
-+++ b/src/transports/appendfile.h Wed Apr 13 12:08:31 2011 +0200
+diff -r 094efc6f5bac src/transports/appendfile.h
+--- a/src/transports/appendfile.h Tue May 17 15:50:31 2011 +0200
++++ b/src/transports/appendfile.h Tue May 17 15:55:42 2011 +0200
@@ -72,6 +72,8 @@
BOOL mbx_format;
BOOL quota_warn_threshold_is_percent;