summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-04-01 19:44:04 +0200
committerErich Eckner <git@eckner.net>2021-04-01 19:44:04 +0200
commit9d8059cb7b97a5bf0a56c2ddcb69fa5d1572e28c (patch)
tree1670cc7c71a386038c2fcaabef0544e56812c736
parent861992fce39b7a9f16864228ca7d6fae0ce850a0 (diff)
downloadlogwatch-overrides-9d8059cb7b97a5bf0a56c2ddcb69fa5d1572e28c.tar.xz
courier: zdkimfilter: understand "transformation enabled for ..." even with quotes in the email address
-rw-r--r--courier2
1 files changed, 1 insertions, 1 deletions
diff --git a/courier b/courier
index 17f36de..d86456c 100644
--- a/courier
+++ b/courier
@@ -596,7 +596,7 @@ while (defined($ThisLine = <STDIN>)) {
$zdkimResults{$domain}{$result}++;
} elsif ( (my $domain, my $result) = ($ThisLine =~ /^zdkimfilter\[[0-9]+\]:id=\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]+\]:(id=\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)$/ ) ) {
$zdkimErrors{$zdkimError}++;