aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-01-31 07:37:08 -0800
committerMark Sapiro <mark@msapiro.net>2016-01-31 07:37:08 -0800
commit2b6a5c4ca7eb98e702a54690fd3de4c8a0162979 (patch)
tree41906440c9fcd6de913f4516bbbe63d704ee0423
parent38130ec85d2cc75b70f647b0b1f9a769a196d6a9 (diff)
downloadmailman2-2b6a5c4ca7eb98e702a54690fd3de4c8a0162979.tar.gz
mailman2-2b6a5c4ca7eb98e702a54690fd3de4c8a0162979.tar.xz
mailman2-2b6a5c4ca7eb98e702a54690fd3de4c8a0162979.zip
Modified contrib/mmdsr to report DMARC lookups in its own category.
-rw-r--r--NEWS3
-rw-r--r--contrib/mmdsr12
2 files changed, 14 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6e242fd4..9c95f026 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Modified contrib/mmdsr to report held and banned subscriptions and DMARC
+ lookups in their own categories.
+
- Fixed a bug that could create a garbled From: header with certain DMARC
mitigation actions. (LP: #1536816)
diff --git a/contrib/mmdsr b/contrib/mmdsr
index 94d55b4e..3336fdb2 100644
--- a/contrib/mmdsr
+++ b/contrib/mmdsr
@@ -193,6 +193,11 @@
# own categories instead of in other errors.
# Replaced s/\+\d+@/+<digits>@/ in vette log
# banned subscription messages due to flood of such.
+#
+# 0.0.25 Update by Mark Sapiro <mark@msapiro.net>
+# Updated on: Sun Jan 31 07:13:47 PST 2016
+# Report vette log DMARC lookups as their own
+# category instead of in other errors.
###############################################################################
# Set up locations of standard commands, directories, etc....
@@ -537,9 +542,14 @@ do
$GREP -i 'banned subscription' $TMPLOG | $AWK '{ print $6 " " $9 }' | $SED -e 's/\+[0-9][0-9]*@/+<digits>@/' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
echo "" >> $TMP
+ echo "DMARC lookups" >> $TMP
+ echo "------------------------------" >> $TMP
+ $GREP -i "DMARC lookup for" $TMPLOG | $AWK '{ print $10 " " $13 }' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
+
+ echo "" >> $TMP
echo "Other Errors:" >> $TMP
echo "------------------------------" >> $TMP
- $EGREP -vi '(Post by non-member|suspicious header|message approved|Discarded posting|bulk message discarded|junk message discarded|Message has implicit destination|Posting to a moderated newsgroup|Post to moderated list|Message discarded, msgid|held subscription request|banned subscription)' $TMPLOG | $SED -e 's/^.* ([0-9]*) //' -e 's/, message-id=<[^> ]*>:/:/' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
+ $EGREP -vi '(Post by non-member|suspicious header|message approved|Discarded posting|bulk message discarded|junk message discarded|Message has implicit destination|Posting to a moderated newsgroup|Post to moderated list|Message discarded, msgid|held subscription request|banned subscription|dmarc lookup for)' $TMPLOG | $SED -e 's/^.* ([0-9]*) //' -e 's/, message-id=<[^> ]*>:/:/' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
elif [ "${LOG}" = "smtp-failure" ] ; then