Recognize a couple more bounces.

5 files changed, 73 insertions, 3 deletions

diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py
index 2c02c1ae..10da479b 100644
--- a/Mailman/Bouncers/Qmail.py
+++ b/Mailman/Bouncers/Qmail.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 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
@@ -32,6 +32,7 @@ import email.Iterators
 # Other (non-standard?) intros have been observed in the wild.
 introtags = [
     'Hi. This is the',
+    'Hi. The MTA program at',
     "We're sorry. There's a problem",
     'Check your send e-mail address.',
     'This is the mail delivery agent at',
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index bd7124b6..67e3a7f8 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 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
@@ -166,6 +166,10 @@ PATTERNS = [
     (_c('- no such user here'),
      _c('There is no user'),
      _c('^(?P<addr>[^\s@]+@[^\s@]+)\s')),
+    # fastdnsservers.com
+    (_c('The following recipient.*could not be reached'),
+     _c('bogus stop pattern'),
+     _c('^(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
     # Next one goes here...
     ]
 
diff --git a/tests/bounces/qmail_06.txt b/tests/bounces/qmail_06.txt
new file mode 100644
index 00000000..1a466d5a
--- /dev/null
+++ b/tests/bounces/qmail_06.txt
@@ -0,0 +1,32 @@
+X-MimeOLE: Produced By Microsoft Exchange V6.5
+Content-class: urn:content-classes:message
+MIME-Version: 1.0
+Content-Type: text/plain;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+Subject: failure notice
+Date: Fri, 13 Feb 2009 09:22:22 -0800
+Message-ID: <200902131732.n1DHWlOA007588@mail.turners.com>
+X-MS-Has-Attach: 
+X-MS-TNEF-Correlator: 
+From: <MAILER-DAEMON@mta6-1.us4.outblaze.com>
+To: <fishads-bounces@lists.xxx.com>
+
+Hi. The MTA program at mta6-1.us4.outblaze.com was unable to deliver =
+your message to the following addresses.
+This is a permanent error.
+
+<ntl@xxx.com>:
+Error 01373: User's Disk Quota Exceeded.
+Sorry, your intended recipient has too much mail stored
+in his mailbox.
+Your message totalled  23 Kbytes.
+However a small (< 1Kb) message will be delivered should
+you wish to inform your recipient you tried to email.
+
+
+--- Below this line is a copy of the message.
+
+
+
+[message content removed - MS]
diff --git a/tests/bounces/simple_34.txt b/tests/bounces/simple_34.txt
new file mode 100644
index 00000000..0c0b10c6
--- /dev/null
+++ b/tests/bounces/simple_34.txt
@@ -0,0 +1,31 @@
+X-MimeOLE: Produced By Microsoft Exchange V6.5
+Content-class: urn:content-classes:message
+MIME-Version: 1.0
+Content-Type: text/plain;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+Subject: Undeliverable: [News] Possible State-Wide Lead Ammo Ban
+Date: Fri, 13 Feb 2009 17:07:17 -0800
+Message-ID: <A6B3019F-262A-4C49-9ACF-E05543110CA6@mailcluster.fastdnsservers.com>
+X-MS-Has-Attach: 
+X-MS-TNEF-Correlator: 
+From: <mailer-daemon@mailcluster.fastdnsservers.com>
+To: <news-bounces@lists.xxx.com>
+
+Your message did not reach some or all of the intended recipients.
+
+   Sent: Fri, 13 Feb 2009 16:57:55 -0800
+   Subject: [News] Possible State-Wide Lead Ammo Ban
+
+The following recipient(s) could not be reached:
+
+roland@xxx.com
+   Error Type: SMTP
+   Remote server (216.122.20.147) issued an error.
+   hMailServer sent: RCPT TO:<roland@xxx.com>
+   Remote server replied: 550 5.1.1 <roland@xxx.com>... User unknown
+
+
+
+hMailServer
+
diff --git a/tests/test_bounces.py b/tests/test_bounces.py
index ae28161c..981465ad 100644
--- a/tests/test_bounces.py
+++ b/tests/test_bounces.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 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
@@ -71,6 +71,7 @@ class BounceTest(unittest.TestCase):
         ('SimpleMatch', 'simple_31.txt', ['nmorel@actisce.fr']),
         ('SimpleMatch', 'simple_32.txt', ['teteyn@agence-forbin.com']),
         ('SimpleMatch', 'simple_33.txt', ['hmu@extralumin.com']),
+        ('SimpleMatch', 'simple_34.txt', ['roland@xxx.com']),
         ('SimpleMatch', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']),
         ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']),
         # SimpleWarning
@@ -125,6 +126,7 @@ class BounceTest(unittest.TestCase):
         ('Qmail', 'qmail_03.txt', ['crown@hbc.co.jp']),
         ('Qmail', 'qmail_04.txt', ['merotiia@tennisnsw.com.au']),
         ('Qmail', 'qmail_05.txt', ['ivokggrrdvc@caixaforte.freeservers.com']),
+        ('Qmail', 'qmail_06.txt', ['ntl@xxx.com']),
         # LLNL's custom Sendmail
         ('LLNL', 'llnl_01.txt', ['trotts1@llnl.gov']),
         # Netscape's server...