diff options
| author | Mark Sapiro <msapiro@value.net> | 2011-12-25 09:25:47 -0800 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2011-12-25 09:25:47 -0800 |
| commit | a6ff8e611b314b145add34b43c278944957d8d5e (patch) | |
| tree | 9c10e449438657249f9ba27829fcf1ebeafa51dd | |
| parent | 5326d6b9d132f23acfe1d79cfbd9793e9aa4a3a4 (diff) | |
| download | mailman2-a6ff8e611b314b145add34b43c278944957d8d5e.tar.gz mailman2-a6ff8e611b314b145add34b43c278944957d8d5e.tar.xz mailman2-a6ff8e611b314b145add34b43c278944957d8d5e.zip | |
Added recognition for another Qmail bounce.
| -rwxr-xr-x[-rw-r--r--] | Mailman/Bouncers/Qmail.py | 5 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | tests/bounces/qmail_07.txt | 25 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/test_bounces.py | 3 |
4 files changed, 32 insertions, 3 deletions
diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py index 10da479b..6d742373 100644..100755 --- a/Mailman/Bouncers/Qmail.py +++ b/Mailman/Bouncers/Qmail.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2009 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -36,7 +36,8 @@ introtags = [ "We're sorry. There's a problem", 'Check your send e-mail address.', 'This is the mail delivery agent at', - 'Unfortunately, your mail was not delivered' + 'Unfortunately, your mail was not delivered', + 'Your mail message to the following', ] acre = re.compile(r'<(?P<addr>[^>]*)>:') @@ -73,6 +73,8 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Added recognition for another Qmail bounce format. + - Fixed an erroneous seek in the Mailman.Mailbox.Mailbox.AppendMessage method that could cause a corrupt mailbox for files opened 'w+'. Bug #901957. diff --git a/tests/bounces/qmail_07.txt b/tests/bounces/qmail_07.txt new file mode 100755 index 00000000..e07a96a2 --- /dev/null +++ b/tests/bounces/qmail_07.txt @@ -0,0 +1,25 @@ +From nobody Sat Dec 24 16:02:20 2011 +Return-Path: <> +X-Original-To: announce-bounces@example.com +Delivered-To: announce-bounces@example.com +Received: from p3plsmtp18-06.prod.phx3.secureserver.net + (p3plsmtp18-06.prod.phx3.secureserver.net [173.201.193.191]) + by example.com (Postfix) with ESMTP id 3E97F130D75 + for <announce-bounces@example.com>; + Sat, 24 Dec 2011 16:02:07 -0500 (EST) +Received: (qmail 1989 invoked for bounce); 24 Dec 2011 21:02:06 -0000 +Date: 24 Dec 2011 21:02:06 -0000 +From: MAILER-DAEMON@p3plsmtp18-06.prod.phx3.secureserver.net +To: announce-bounces@example.com +Subject: failure notice + +Your mail message to the following address(es) could not be delivered. This +is a permanent error. Please verify the addresses and try again. If you are +still having difficulty sending mail to these addresses, please contact +Customer Support at 480-624-2500. + +<user@example.net>: +child status 100...The e-mail message could not be delivered because the user's mailfolder is full. + +--- Below this line is a copy of the message. + diff --git a/tests/test_bounces.py b/tests/test_bounces.py index d370ab31..6bf51570 100644..100755 --- a/tests/test_bounces.py +++ b/tests/test_bounces.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2011 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -135,6 +135,7 @@ class BounceTest(unittest.TestCase): ('Qmail', 'qmail_04.txt', ['merotiia@tennisnsw.com.au']), ('Qmail', 'qmail_05.txt', ['ivokggrrdvc@caixaforte.freeservers.com']), ('Qmail', 'qmail_06.txt', ['ntl@xxx.com']), + ('Qmail', 'qmail_07.txt', ['user@example.net']), # LLNL's custom Sendmail ('LLNL', 'llnl_01.txt', ['trotts1@llnl.gov']), # Netscape's server... |