From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 24 Aug 2017 13:05:04 +0000 (-0400)
Subject: Ignore UTF8SMTP lines.
X-Git-Tag: 1.51.04~17
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=amavis-logwatch.git;a=commitdiff_plain;h=a8dac25fe398e42abdb89b85b1435d52386827b4

Ignore UTF8SMTP lines.

Lines that look like,

  UTF8SMTP :10024 /var/...: <sender@example.net> -> <rcpt@example.com>
  BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by...

were previously unmatched because of the relatively-new "UTF8SMTP".
Similar lines that have "ESMTP" instead of "UTF8SMTP" are already
ignored, so it makes sense to ignore the "UTF8SMTP" lines too.
---

diff --git a/amavis-logwatch b/amavis-logwatch
index 06b60c8..deb9146 100644
--- a/amavis-logwatch
+++ b/amavis-logwatch
@@ -2132,6 +2132,7 @@ while (<>) {
         or ($p1 =~ /^SpamControl/)
         or ($p1 =~ /^Perl/)
         or ($p1 =~ /^ESMTP/)
+        or ($p1 =~ /^UTF8SMTP/)
         or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /)            # log level 4
         or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /)       # log level 4
         or ($p1 =~ /^tempdir being removed/)