From 8932dffe21c3b9fc102e0a976660f1ab6d158179 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Wed, 22 Aug 2007 14:07:30 +0000 Subject: [PATCH] Fix missing quota message for system quota failure with maildir. --- doc/doc-txt/ChangeLog | 6 +++++- src/src/transports/appendfile.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 94d00ccef..17e87d0dc 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.523 2007/08/22 10:10:23 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.524 2007/08/22 14:07:30 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -83,6 +83,10 @@ PH/16 Another patch from the Sieve maintainer. PH/17 Added the NOTQUIT ACL, based on a patch from Ted Cooper. +PH/18 If a system quota error occurred while trying to create the file for + a maildir delivery, the message "Mailbox is full" was not appended to the + bounce if the delivery eventually timed out. Change 4.67/27 below applied + only to a quota excession during the actual writing of the file. Exim version 4.67 diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c index 16aa3927b..fbda8262d 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.22 2007/02/20 09:53:41 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.23 2007/08/22 14:07:30 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -2451,6 +2451,8 @@ else addr->message = string_sprintf ("failed to open %s (%d tr%s)", filename, i, (i == 1)? "y" : "ies"); addr->basic_errno = errno; + if (errno == errno_quota || errno == ENOSPC) + addr->user_message = US"mailbox is full"; return FALSE; } -- 2.30.2