From: Philip Hazel Date: Tue, 20 Feb 2007 09:53:41 +0000 (+0000) Subject: Make bounce for system quota error the same as for Exim quota. X-Git-Tag: exim-4_67~32 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/5a11a7b41649e95629fa9944a2fa81b3e50707e4 Make bounce for system quota error the same as for Exim quota. --- diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index c84608291..33ecda9d3 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.481 2007/02/16 22:23:35 magnus Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.482 2007/02/20 09:53:41 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -109,6 +109,11 @@ SC/02 Applied Daniel Tiefnig's patch to improve the '($parent) =' pattern match. PH/26 Added a "continue" ACL modifier that does nothing, for the benefit of its expansion side effects. +PH/27 When a message times out after an over-quota error from an Exim-imposed + quota, the bounce message says "mailbox is full". This message was not + being given when it was a system quota that was exceeded. It now should + be the same. + MH/03 Made $recipients available in local_scan(). local_scan() already has better access to the recipient list through recipients_list[], but $recipients can be useful in postmaster-provided expansion strings. diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c index f31232a0f..16aa3927b 100644 --- a/src/src/transports/appendfile.c +++ b/src/src/transports/appendfile.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.21 2007/01/22 16:29:55 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.22 2007/02/20 09:53:41 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -2903,6 +2903,7 @@ if (yield != OK) #else addr->message = string_sprintf("mailbox is full"); #endif /* EDQUOT */ + addr->user_message = US"mailbox is full"; DEBUG(D_transport) debug_printf("System quota exceeded for %s%s%s\n", dataname, isdirectory? US"" : US": time since file read = ",