From 9d8059cb7b97a5bf0a56c2ddcb69fa5d1572e28c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 1 Apr 2021 19:44:04 +0200 Subject: courier: zdkimfilter: understand "transformation enabled for ..." even with quotes in the email address --- courier | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/courier b/courier index 17f36de..d86456c 100644 --- a/courier +++ b/courier @@ -596,7 +596,7 @@ while (defined($ThisLine = )) { $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}++; -- cgit v1.2.3-70-g09d2