courier updates

1 files changed, 11 insertions, 5 deletions

diff --git a/courier b/courier
index d86456c..2b807da 100644
--- a/courier
+++ b/courier
@@ -583,7 +583,13 @@ while (defined($ThisLine = <STDIN>)) {
          $Stoppfilter++;
       } elsif ( $ThisLine =~ /^pythonfilter greylist reject/ ) {
          $GreylistReject++;
-      } elsif ( (my $results, undef, my $domain) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: verified:( [^(]+ )\(id=([^@]*\@)?([^@[:space:]]+), .*$/ ) ) {
+      } elsif ( $ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: verify msg from / ) {
+         # this is accompanied by another line
+      } elsif ( $ThisLine =~ /^St(art|opp)ing zdkimfilter$/ ) {
+         # do not count starts and stops
+      } elsif ( $ThisLine =~ /^zdkimfilter\[[0-9]+\]:(running|exiting)$/ ) {
+         # do not count starts and stops
+      } elsif ( (my $results, undef, my $domain) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:ip=\S+: verified:( [^(]+ )\(id=([^@]*\@)?([^@[:space:]]+), .*$/ ) ) {
          my $result = "";
          if ( (my $spfResult) = ($results =~ / spf=([^ ,]+)[ ,]/ )) {
             $result .= ", spf: ".$spfResult;
@@ -592,13 +598,13 @@ while (defined($ThisLine = <STDIN>)) {
             $result .= ", dkim: ".$dkimResult;
          };
          $zdkimResults{$domain}{substr $result, 2}++;
-      } elsif ( (my $domain, my $result) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: (\S+) (pass only because \S+)$/ ) ) {
+      } elsif ( (my $domain, my $result) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:ip=\S+: (\S+) (pass only because \S+)$/ ) ) {
          $zdkimResults{$domain}{$result}++;
-      } elsif ( (my $domain, my $result) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: signature by (\S+), s=\S+ (recovered by transformation)$/ ) ) {
+      } elsif ( (my $domain, my $result) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:ip=\S+: signature by (\S+), s=\S+ (recovered by transformation)$/ ) ) {
          $zdkimResults{$domain}{$result}++;
-      } elsif ( ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:(id=\S+: )?transformation enabled for "[^"]*("[^"]*"[^"]*)*(" retry (header and body|(header|body) only))$/) ) {
+      } elsif ( ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:(ip=\S+: )?transformation enabled for "[^"]*("[^"]*"[^"]*)*(" retry (header and body|(header|body) only))$/) ) {
          # this is accompanied by another line
-      } elsif ( (undef, my $zdkimError) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:(id=\S+: )?(Cannot sign message: no authenticated sender, empty or disabled RELAYCLIENT, and no default_domain|transformation enabled for "[^"]+(" retry (header and body|(header|body) only))?|Original header without colon:  (Can't use Bind DLZ through LDAPS SSL|underscore in A or PTR records|BIND DLZ - ldap_init and LDAP_PORT function argument values)|renaming unparseable Authentication-Results|temporary verification failure: '[^']+' query failed)$/ ) ) {
+      } elsif ( (undef, my $zdkimError) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:(ip=\S+: )?(Cannot sign message: no authenticated sender, empty or disabled RELAYCLIENT, and no default_domain|transformation enabled for "[^"]+(" retry (header and body|(header|body) only))?|Original header without colon:  (Can't use Bind DLZ through LDAPS SSL|underscore in A or PTR records|BIND DLZ - ldap_init and LDAP_PORT function argument values)|renaming (unparseable )?Authentication-Results( from \S+)?|temporary verification failure: '[^']+' query failed)$/ ) ) {
          $zdkimErrors{$zdkimError}++;
       } elsif (
          ( $ThisLine =~ /^Initialized the \S+ python filter$/ ) or