diff options
author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2019-01-08 15:25:41 +0900 |
---|---|---|
committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2019-01-08 15:25:41 +0900 |
commit | d8ee0235efb4052d0e489ba1dba0af812873df14 (patch) | |
tree | 021691a2f050722fba1b157affeb5730f270009d /Mailman/Bouncers/DSN.py | |
parent | f63b5341247ff89ebad4ce6e13d8a90410e2bd12 (diff) | |
parent | 189515c4d3f1ed52b83d63577ebefec5c991b281 (diff) | |
download | mailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.tar.gz mailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.tar.xz mailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.zip |
merge lp:mailman/2.1 up to rev 1805
Diffstat (limited to 'Mailman/Bouncers/DSN.py')
-rw-r--r-- | Mailman/Bouncers/DSN.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mailman/Bouncers/DSN.py b/Mailman/Bouncers/DSN.py index 701617db..b316c696 100644 --- a/Mailman/Bouncers/DSN.py +++ b/Mailman/Bouncers/DSN.py @@ -56,7 +56,8 @@ def check(msg): # Some MTAs have been observed that put comments on the action. if action.startswith('delayed'): return Stop - if not action.startswith('fail'): + # opensmtpd uses non-compliant Action: error. + if not (action.startswith('fail') or action.startswith('error')): # Some non-permanent failure, so ignore this block continue params = [] |