summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-02-18 09:07:22 +0100
committerErich Eckner <git@eckner.net>2021-02-18 09:07:22 +0100
commite42c04665d02bd42fa5f0e979bb5f56f5048e5cd (patch)
tree78679cfaf972370d3139ebc77a8ce5fa3b30db02
parent785b8756817e4a7f642ec8d750ed35e4395b3df1 (diff)
downloadlogwatch-overrides-e42c04665d02bd42fa5f0e979bb5f56f5048e5cd.tar.xz
courier: update zdkim log line regex
-rw-r--r--courier2
1 files changed, 1 insertions, 1 deletions
diff --git a/courier b/courier
index 6789ba7..4afa14c 100644
--- a/courier
+++ b/courier
@@ -569,7 +569,7 @@ while (defined($ThisLine = <STDIN>)) {
$Stoppfilter++;
} elsif ( $ThisLine =~ /^pythonfilter greylist reject/ ) {
$GreylistReject++;
- } elsif ( (my $results, my $domain) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: verified:( [^(]+ )\(id=[^@]*\@(\S+), .*$/ ) ) {
+ } elsif ( (my $results, undef, my $domain) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\S+: verified:( [^(]+ )\(id=([^@]*\@)?([^@[:space:]]+), .*$/ ) ) {
my $result = "";
if ( (my $spfResult) = ($results =~ / spf=([^ ,]+)[ ,]/ )) {
$result .= ", spf: ".$spfResult;