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 06b60c8d937846cdfcc39889a17aaf16a9559946..deb91463c8025db4c6f6d70648321fdaf95d5f12 100644 (file)
--- 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/)