courier: ignore cpu time accountings for zdkim and second lines of spamassassin and greylisting

1 files changed, 6 insertions, 0 deletions

diff --git a/courier b/courier
index e2549d2..4870fea 100644
--- a/courier
+++ b/courier
@@ -403,6 +403,9 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /^Purging /) or
       ($ThisLine =~ /^completed,id=/) or
       ($ThisLine =~ /^queuelo=.*, queuehi=.*/) or
+      # These emit a second line which gets mangled below
+      ($ThisLine =~ /^CPU TIME ACCOUNTING: \S+ processed with \S+ seconds: /) or
+      ($ThisLine =~ /^pythonfilter spamassassin reject\S+: 554 Mail rejected - spam detected: Yes,/) or
       # Do we really want to ignore these?
       # currently i'm too lazy to include this
       ($ThisLine =~ /^started,ip=.*/) or ##courieresmtpd
@@ -448,6 +451,9 @@ while (defined($ThisLine = <STDIN>)) {
             $ThisLine = $';
          }
          if (( $Msg ) = ( $ThisLine =~ /^msg=(.*)/ )) { }
+         if (( $Msg ) = ($ThisLine =~ /451 4.7.1 Greylisting in action, please come back in /)) {
+            next;
+         }
 
          $ThisLine =~ s/^: //;