aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2014-05-29 08:38:47 -0700
committerMark Sapiro <mark@msapiro.net>2014-05-29 08:38:47 -0700
commit1bbdb3ac38c2ee6f3704694c49069d7d4e383ae3 (patch)
tree6f8100c87f3a8adc7f0734bc53194b2c3e1f136d
parent162234d13d13817514fc47c7422191dfd8b73ec9 (diff)
downloadmailman2-1bbdb3ac38c2ee6f3704694c49069d7d4e383ae3.tar.gz
mailman2-1bbdb3ac38c2ee6f3704694c49069d7d4e383ae3.tar.xz
mailman2-1bbdb3ac38c2ee6f3704694c49069d7d4e383ae3.zip
If checking DNS for dmarc_moderation_action and DNS lookup is not
available, log it. (LP: #1324541)
Diffstat (limited to '')
-rw-r--r--Mailman/Utils.py6
-rwxr-xr-xNEWS3
2 files changed, 8 insertions, 1 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 8290bf14..1bbb9bb1 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1070,7 +1070,11 @@ def suspiciousHTML(html):
# or possibly quarantine.
def IsDMARCProhibited(mlist, email):
if not dns_resolver:
- return False
+ # This is a problem; log it.
+ syslog('error',
+ 'DNS lookup for dmarc_moderation_action for list %s not available',
+ mlist.real_name)
+ return False
email = email.lower()
at_sign = email.find('@')
diff --git a/NEWS b/NEWS
index e71f53c5..c7f562a5 100755
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
2.1.19 (xx-xxx-xxxx)
+
+ - If checking DNS for dmarc_moderation_action and DNS lookup is not
+ available, log it. (LP: #1324541)
Bug fixes and other patches