1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 124a35dbf1399ba64efa3391306e18d9971d3d8b |
2 # Parent 094efc6f5bac18d49a1b5873257b0e729241dc55 |
3 |
3 |
4 diff -r 124a35dbf139 doc/spec.txt |
4 diff -r 094efc6f5bac doc/spec.txt |
5 --- a/doc/spec.txt Wed Apr 13 12:08:14 2011 +0200 |
5 --- a/doc/spec.txt Tue May 17 15:50:31 2011 +0200 |
6 +++ b/doc/spec.txt Wed Apr 13 12:08:31 2011 +0200 |
6 +++ b/doc/spec.txt Tue May 17 15:55:42 2011 +0200 |
7 @@ -18340,6 +18340,9 @@ |
7 @@ -18902,6 +18902,9 @@ |
8 large file support (Linux and FreeBSD have this), mailboxes larger than 2G can |
8 large file support (Linux and FreeBSD have this), mailboxes larger than 2G can |
9 be handled. |
9 be handled. |
10 |
10 |
11 +If there is "/no_check" appended, then quota updating is done as usual, but the |
11 +If there is "/no_check" appended, then quota updating is done as usual, but the |
12 +over quota condition does not prevent the delivery. |
12 +over quota condition does not prevent the delivery. |
13 + |
13 + |
14 Note: A value of zero is interpreted as "no quota". |
14 Note: A value of zero is interpreted as "no quota". |
15 |
15 |
16 The expansion happens while Exim is running as root, before it changes uid for |
16 The expansion happens while Exim is running as root, before it changes uid for |
17 @@ -18378,6 +18381,9 @@ |
17 @@ -18940,6 +18943,9 @@ |
18 failure causes delivery to be deferred. A value of zero is interpreted as "no |
18 failure causes delivery to be deferred. A value of zero is interpreted as "no |
19 quota". |
19 quota". |
20 |
20 |
21 +If there is "/no_check" appended, then quota updating is done as usual, but the |
21 +If there is "/no_check" appended, then quota updating is done as usual, but the |
22 +over quota condition does not prevent the delivery. |
22 +over quota condition does not prevent the delivery. |
23 + |
23 + |
24 +--------------------------------------------------------------+ |
24 +------------------+---------------+-------------+-------------+ |
25 |quota_is_inclusive|Use: appendfile|Type: boolean|Default: true| |
25 |quota_is_inclusive|Use: appendfile|Type: boolean|Default: true| |
26 +--------------------------------------------------------------+ |
26 +------------------+---------------+-------------+-------------+ |
27 diff -r 124a35dbf139 src/transports/appendfile.c |
27 diff -r 094efc6f5bac src/transports/appendfile.c |
28 --- a/src/transports/appendfile.c Wed Apr 13 12:08:14 2011 +0200 |
28 --- a/src/transports/appendfile.c Tue May 17 15:50:31 2011 +0200 |
29 +++ b/src/transports/appendfile.c Wed Apr 13 12:08:31 2011 +0200 |
29 +++ b/src/transports/appendfile.c Tue May 17 15:55:42 2011 +0200 |
30 @@ -236,7 +236,9 @@ |
30 @@ -236,7 +236,9 @@ |
31 FALSE, /* mailstore_format */ |
31 FALSE, /* mailstore_format */ |
32 FALSE, /* mbx_format */ |
32 FALSE, /* mbx_format */ |
33 FALSE, /* quota_warn_threshold_is_percent */ |
33 FALSE, /* quota_warn_threshold_is_percent */ |
34 - TRUE /* quota_is_inclusive */ |
34 - TRUE /* quota_is_inclusive */ |
95 mode, ob->notify_comsat, ob->quota_value, |
95 mode, ob->notify_comsat, ob->quota_value, |
96 + ob->quota_no_check? " (no_check)" : "", |
96 + ob->quota_no_check? " (no_check)" : "", |
97 ob->quota_warn_threshold_value, |
97 ob->quota_warn_threshold_value, |
98 ob->quota_warn_threshold_is_percent? "%" : "", |
98 ob->quota_warn_threshold_is_percent? "%" : "", |
99 isdirectory? "directory" : "file", |
99 isdirectory? "directory" : "file", |
100 @@ -2748,18 +2764,31 @@ |
100 @@ -2751,18 +2767,31 @@ |
101 } |
101 } |
102 if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value) |
102 if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value) |
103 { |
103 { |
104 - DEBUG(D_transport) debug_printf("mailbox quota exceeded\n"); |
104 - DEBUG(D_transport) debug_printf("mailbox quota exceeded\n"); |
105 - yield = DEFER; |
105 - yield = DEFER; |
137 + filecount_msg = US" filecount"; |
137 + filecount_msg = US" filecount"; |
138 + } |
138 + } |
139 } |
139 } |
140 } |
140 } |
141 |
141 |
142 diff -r 124a35dbf139 src/transports/appendfile.h |
142 diff -r 094efc6f5bac src/transports/appendfile.h |
143 --- a/src/transports/appendfile.h Wed Apr 13 12:08:14 2011 +0200 |
143 --- a/src/transports/appendfile.h Tue May 17 15:50:31 2011 +0200 |
144 +++ b/src/transports/appendfile.h Wed Apr 13 12:08:31 2011 +0200 |
144 +++ b/src/transports/appendfile.h Tue May 17 15:55:42 2011 +0200 |
145 @@ -72,6 +72,8 @@ |
145 @@ -72,6 +72,8 @@ |
146 BOOL mbx_format; |
146 BOOL mbx_format; |
147 BOOL quota_warn_threshold_is_percent; |
147 BOOL quota_warn_threshold_is_percent; |
148 BOOL quota_is_inclusive; |
148 BOOL quota_is_inclusive; |
149 + BOOL quota_no_check; |
149 + BOOL quota_no_check; |