X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=amavis-logwatch;h=4c9b59f69aae4127c113f637d0165c093b6bc31f;hb=869fa9d8b2113f50c3a97ef9f4a1f95171702be4;hp=6d06793fd721abd5ffded56ce9a1a869ba92f645;hpb=a93ee5d433308d2cac76ac9502e34c953ff96337;p=amavis-logwatch.git

diff --git a/amavis-logwatch b/amavis-logwatch
index 6d06793..4c9b59f 100644
--- a/amavis-logwatch
+++ b/amavis-logwatch
@@ -2029,7 +2029,7 @@ sub create_ignore_list() {
    push @ignore_list_final, qr/^address modified \(/;
    push @ignore_list_final, qr/^Request: AM\.PDP /;
    push @ignore_list_final, qr/^DSPAM result: /;
-   push @ignore_list_final, qr/^bind to \//;
+   push @ignore_list_final, qr/^(will )?bind to \//;
    push @ignore_list_final, qr/^ZMQ enabled: /;
 
    push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
@@ -2052,6 +2052,12 @@ sub create_ignore_list() {
    # describe what is being sent to the systemd notification socket,
    # if one exists.
    push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
+
+   # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null
+   # bytes that it finds in the body of a message with a "modified
+   # UTF-8" encoded null. The number of times it does this is then
+   # logged with the following message.
+   push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL byte\(s\)/;
 }
 
 # Notes:
@@ -2811,6 +2817,7 @@ while (<>) {
           ($p1 =~ /^TROUBLE/) or
           ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or
           ($p1 =~ /: Empty result from /) or
+          ($p1 =~ /: Select failed: Interrupted system call/) or
           ($p1 =~ /: Error reading from socket: Connection reset by peer/) or
           ($p1 =~ /open\(.*\): Permission denied/) or
           ($p1 =~ /^_?WARN: /) or