1 files changed, 33 insertions, 1 deletions

diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index d344f3289..3cdde6726 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -107,7 +107,7 @@ PATTERNS = [
     (_c('^Your message\s*$'),
      _c('^because:'),
      _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
-    # kviv.be (NTMail)
+    # kviv.be (InterScan NT)
     (_c('^Unable to deliver message to'),
      _c(r'\*+\s+End of message\s+\*+'),
      _c('<(?P<addr>[^>]*)>')),
@@ -131,6 +131,38 @@ PATTERNS = [
     (_c('A message that you sent could not be delivered'),
      _c('^---'),
      _c('(?P<addr>[^\s@]+@[^\s@)]+)')),
+    # LSMTP for Windows
+    (_c('^--> Error description:\s*$'),
+     _c('^Error-End:'),
+     _c('^Error-for:\s+(?P<addr>[^\s@]+@[^\s@]+)')),
+    # Qmail with a tri-language intro beginning in spanish
+    (_c('Your message could not be delivered'),
+     _c('^-'),
+     _c('<(?P<addr>[^>]*)>:')),
+    # socgen.com
+    (_c('Your message could not be delivered to'),
+     _c('^\s*$'),
+     _c('(?P<addr>[^\s@]+@[^\s@]+)')),
+    # dadoservice.it
+    (_c('Your message has encountered delivery problems'),
+     _c('Your message reads'),
+     _c('addressed to\s*(?P<addr>[^\s@]+@[^\s@)]+)')),
+    # gomaps.com
+    (_c('Did not reach the following recipient'),
+     _c('^\s*$'),
+     _c('\s(?P<addr>[^\s@]+@[^\s@]+)')),
+    # EYOU MTA SYSTEM
+    (_c('This is the deliver program at'),
+     _c('^-'),
+     _c('^(?P<addr>[^\s@]+@[^\s@<>]+)')),
+    # A non-standard qmail at ieo.it
+    (_c('this is the email server at'),
+     _c('^-'),
+     _c('\s(?P<addr>[^\s@]+@[^\s@]+)[\s,]')),
+    # pla.net.py (MDaemon.PRO ?)
+    (_c('no such user here'),
+     _c('There is no user'),
+     _c('^(?P<addr>[^\s@]+@[^\s@]+)\s')),
     # Next one goes here...
     ]