diff -r 9b0dcedaddc2 -r 1a5f0c5987d0 src.overquota --- a/src.overquota Tue May 17 16:14:22 2011 +0200 +++ b/src.overquota Tue May 17 16:19:46 2011 +0200 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent e5aaf8e99b1e7f5ff16649a4b8a69716b82b9cc2 +# Parent f28044d5dcaf4418eb3c92fd325ce439c57cbab4 -diff -r e5aaf8e99b1e doc/spec.txt ---- a/doc/spec.txt Thu Apr 07 15:38:24 2011 +0200 -+++ b/doc/spec.txt Thu Apr 07 16:05:46 2011 +0200 -@@ -18143,6 +18143,16 @@ - or not it ends with "/". This option is available only if SUPPORT_MAILDIR is - present in Local/Makefile. See section 26.5 below for further details. +diff -r f28044d5dcaf doc/spec.txt +--- a/doc/spec.txt Tue May 17 16:17:21 2011 +0200 ++++ b/doc/spec.txt Tue May 17 16:17:42 2011 +0200 +@@ -4,6 +4,16 @@ + + Copyright (c) 2011 University of Cambridge ++-------------------------------------------------------------------+ +|maildir_overquota_file|Use: appendfile|Type: string*|Default: unset| @@ -19,11 +19,11 @@ +The filename is taken relative to the mailir directory. + +-----------------------------------------------------------------------------+ - |maildir_quota_directory_regex|Use: appendfile|Type: string|Default: See below| - +-----------------------------------------------------------------------------+ -diff -r e5aaf8e99b1e src/transports/appendfile.c ---- a/src/transports/appendfile.c Thu Apr 07 15:38:24 2011 +0200 -+++ b/src/transports/appendfile.c Thu Apr 07 16:05:46 2011 +0200 + +-------------------------------------+--------------------------------+------+ + |Revision 4.76 |06 May 2011 |EM | +diff -r f28044d5dcaf src/transports/appendfile.c +--- a/src/transports/appendfile.c Tue May 17 16:17:21 2011 +0200 ++++ b/src/transports/appendfile.c Tue May 17 16:17:42 2011 +0200 @@ -104,6 +104,8 @@ #ifdef SUPPORT_MAILDIR { "maildir_format", opt_bool, @@ -49,7 +49,7 @@ /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size, mailbox_filecount */ -@@ -2776,9 +2780,10 @@ +@@ -2778,9 +2782,10 @@ is for the mailbox already being over quota (i.e. the current message is not included in the check). */ @@ -62,7 +62,7 @@ { debug_printf("Exim quota = " OFF_T_FMT " old size = " OFF_T_FMT " this message = %d (%sincluded)\n", -@@ -2789,31 +2794,62 @@ +@@ -2791,31 +2796,62 @@ } if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value) { @@ -140,9 +140,9 @@ } } -diff -r e5aaf8e99b1e src/transports/appendfile.h ---- a/src/transports/appendfile.h Thu Apr 07 15:38:24 2011 +0200 -+++ b/src/transports/appendfile.h Thu Apr 07 16:05:46 2011 +0200 +diff -r f28044d5dcaf src/transports/appendfile.h +--- a/src/transports/appendfile.h Tue May 17 16:17:21 2011 +0200 ++++ b/src/transports/appendfile.h Tue May 17 16:17:42 2011 +0200 @@ -24,6 +24,7 @@ uschar *mailbox_size_string; uschar *mailbox_filecount_string;