--- a/src.overquota Thu Apr 07 15:30:09 2011 +0200
+++ b/src.overquota Thu Apr 07 16:06:04 2011 +0200
@@ -1,9 +1,29 @@
# HG changeset patch
-# Parent 70d48c9a5cfe16fac997537f3e902328212548a5
+# Parent e5aaf8e99b1e7f5ff16649a4b8a69716b82b9cc2
-diff -r 70d48c9a5cfe src/transports/appendfile.c
---- a/src/transports/appendfile.c Fri Apr 01 16:36:30 2011 +0200
-+++ b/src/transports/appendfile.c Thu Apr 07 15:29:50 2011 +0200
+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.
+
+++-------------------------------------------------------------------+
++|maildir_overquota_file|Use: appendfile|Type: string*|Default: unset|
+++-------------------------------------------------------------------+
++
++If this option is set, Exim will create a timestamp file with this name (after
++expansion) as soon as the the MTA imposed quota limit is hit. If Exim finds
++this file, but the quota is not reached, the file gets removed.
++
++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
@@ -104,6 +104,8 @@
#ifdef SUPPORT_MAILDIR
{ "maildir_format", opt_bool,
@@ -98,7 +118,7 @@
+ * to record this overquota event */
+ if (ob->maildir_overquota_file)
+ {
-+ uschar *overquota_file = string_sprintf("%s/%s", path, ob->maildir_overquota_file);
++ uschar *overquota_file = string_sprintf("%s/%s", path, expand_string(ob->maildir_overquota_file));
+ if (overquota)
+ {
+ int _errno = errno;
@@ -120,9 +140,9 @@
}
}
-diff -r 70d48c9a5cfe src/transports/appendfile.h
---- a/src/transports/appendfile.h Fri Apr 01 16:36:30 2011 +0200
-+++ b/src/transports/appendfile.h Thu Apr 07 15:29:50 2011 +0200
+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
@@ -24,6 +24,7 @@
uschar *mailbox_size_string;
uschar *mailbox_filecount_string;