git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eb04cef
)
Testsuite: ignore optional-config output
author
Jeremy Harris
<jgh146exb@wizmail.org>
Fri, 20 Oct 2017 15:21:32 +0000
(16:21 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Fri, 20 Oct 2017 16:44:04 +0000
(17:44 +0100)
test/runtest
patch
|
blob
|
history
test/scripts/3000-Perl/3000
patch
|
blob
|
history
test/stderr/0402
patch
|
blob
|
history
test/stderr/0544
patch
|
blob
|
history
test/stderr/5410
patch
|
blob
|
history
test/stderr/5420
patch
|
blob
|
history
test/stdout/0572
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 71ee0f68e1755c9cb8b55cf846f481119021e5e2..d8c64eabcec68be2721019be573f8843700b4ad2 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1082,7
+1082,7
@@
RESET_AFTER_EXTRA_LINE_READ:
if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
{
$_ .= <IN>;
if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
{
$_ .= <IN>;
- s/
\s
+\}\}(?=\(Exim )/\}\} /;
+ s/
[ ╎]
+\}\}(?=\(Exim )/\}\} /;
}
if (/^ condition: def:tls_cipher$/)
{
}
if (/^ condition: def:tls_cipher$/)
{
@@
-1535,10
+1535,11
@@
$munges =
dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity)
|gnutls_require_(kx|mac|protocols)
|hosts_(requ(est|ire)|try)_(dane|ocsp)
dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity)
|gnutls_require_(kx|mac|protocols)
|hosts_(requ(est|ire)|try)_(dane|ocsp)
- |hosts_(avoid|nopass|require|verify_avoid)_tls
+ |hosts_(avoid|nopass|
noproxy|
require|verify_avoid)_tls
|socks_proxy
|tls_[^ ]*
|socks_proxy
|tls_[^ ]*
- )($|[ ]=)/x' },
+ )($|[ ]=)/x'
+ },
'sys_bindir' =>
{ 'mainlog' => 's%/(usr/(local/)?)?bin/%SYSBINDIR/%' },
'sys_bindir' =>
{ 'mainlog' => 's%/(usr/(local/)?)?bin/%SYSBINDIR/%' },
@@
-1557,6
+1558,8
@@
$munges =
'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux
{ 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux
{ 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
+
+ 'perl_variants'
};
};
diff --git
a/test/scripts/3000-Perl/3000
b/test/scripts/3000-Perl/3000
index 30ac29eb36ede58fe404ea06debd859b73396ae8..60db492ad328c1c419679ebdda39688146cf8aa4 100644
(file)
--- a/
test/scripts/3000-Perl/3000
+++ b/
test/scripts/3000-Perl/3000
@@
-1,4
+1,5
@@
# Embedded Perl
# Embedded Perl
+munge perl_variants
exim -be
${perl{foo}}
${perl{foo}{arg1}}
exim -be
${perl{foo}}
${perl{foo}{arg1}}
diff --git
a/test/stderr/0402
b/test/stderr/0402
index eae68a2b07883ae67769c37fe62695cf06855cca..84f43ad7e6627292e0e8f45156d64213562fe239 100644
(file)
--- a/
test/stderr/0402
+++ b/
test/stderr/0402
@@
-46,7
+46,7
@@
Data file written for message 10HmaX-0005vi-00
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-54,7
+54,7
@@
Data file written for message 10HmaX-0005vi-00
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-64,19
+64,19
@@
Data file written for message 10HmaX-0005vi-00
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-87,7
+87,7
@@
Data file written for message 10HmaX-0005vi-00
├──condition: def:sender_helo_name
├─────result: false
┌───scanning: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: false
┌───scanning: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-101,7
+101,7
@@
Data file written for message 10HmaX-0005vi-00
└─────result: from CALLER
├──condition: def:received_protocol
├─────result: true
└─────result: from CALLER
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-139,7
+139,7
@@
Data file written for message 10HmaX-0005vi-00
└───skipping: result is not used
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
diff --git
a/test/stderr/0544
b/test/stderr/0544
index f32cd888622e15603746540743aa620ae3459c03..894ae0fb24437fe92e04f2888343661f94aab85c 100644
(file)
--- a/
test/stderr/0544
+++ b/
test/stderr/0544
@@
-6,7
+6,7
@@
admin user
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-14,7
+14,7
@@
admin user
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-24,19
+24,19
@@
admin user
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-47,7
+47,7
@@
admin user
├──condition: def:sender_helo_name
├─────result: false
┌───scanning: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: false
┌───scanning: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-61,7
+61,7
@@
admin user
└─────result: from CALLER
├──condition: def:received_protocol
├─────result: true
└─────result: from CALLER
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-99,7
+99,7
@@
admin user
└───skipping: result is not used
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
diff --git
a/test/stderr/5410
b/test/stderr/5410
index b4db690abb83cf8f0037e3a50219ef1b85ea1418..dda1875d7df7b4ff18662cccc129882167459cc0 100644
(file)
--- a/
test/stderr/5410
+++ b/
test/stderr/5410
@@
-136,7
+136,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-144,7
+144,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-154,19
+154,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-177,7
+177,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-191,7
+191,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-228,7
+228,7
@@
end of inline ACL: ACCEPT
for userx@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for userx@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-362,7
+362,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-370,7
+370,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-380,19
+380,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-403,7
+403,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-417,7
+417,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-454,7
+454,7
@@
end of inline ACL: ACCEPT
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-588,7
+588,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-596,7
+596,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-606,19
+606,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-629,7
+629,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-643,7
+643,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-680,7
+680,7
@@
end of inline ACL: ACCEPT
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
diff --git
a/test/stderr/5420
b/test/stderr/5420
index b3444004661284ff049c965bc1cbe3484a6da979..0d5ca751f831494761f24bec6aeba9437c54c5a3 100644
(file)
--- a/
test/stderr/5420
+++ b/
test/stderr/5420
@@
-135,7
+135,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-143,7
+143,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-153,19
+153,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-176,7
+176,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-190,7
+190,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-227,7
+227,7
@@
end of inline ACL: ACCEPT
for userx@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for userx@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-361,7
+361,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-369,7
+369,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-379,19
+379,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-402,7
+402,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-416,7
+416,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-453,7
+453,7
@@
end of inline ACL: ACCEPT
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-587,7
+587,7
@@
end of inline ACL: ACCEPT
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-595,7
+595,7
@@
end of inline ACL: ACCEPT
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
├─────result: false
┌───scanning: from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-605,19
+605,19
@@
end of inline ACL: ACCEPT
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
└───skipping: result is not used
┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
├──condition: def:sender_ident
├─────result: true
┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
+ ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎
}}
(Exim $version_number)
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
╎ ${if def:sender_address {(envelope-from <$sender_address>)
╎ }}id $message_exim_id${if def:received_for {
╎ for $received_for}}
@@
-628,7
+628,7
@@
end of inline ACL: ACCEPT
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
├──condition: def:sender_helo_name
├─────result: true
┌considering: (helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-642,7
+642,7
@@
end of inline ACL: ACCEPT
├──condition: def:received_protocol
├─────result: true
├──condition: def:received_protocol
├─────result: true
- ┌considering: with $received_protocol
}}
(Exim $version_number)
+ ┌considering: with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@
-679,7
+679,7
@@
end of inline ACL: ACCEPT
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
for usery@domain.com
├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
- }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
+ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol
}}
(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
diff --git
a/test/stdout/0572
b/test/stdout/0572
index 8b7a17a781def993d4f4f7e2f2c695f349d18adf..96ab5611b10d95bef59ad6c11a2e7089380fccd3 100644
(file)
--- a/
test/stdout/0572
+++ b/
test/stdout/0572
@@
-53,7
+53,6
@@
hosts_avoid_esmtp =
hosts_avoid_pipelining =
hosts_max_try = 5
hosts_max_try_hardlimit = 50
hosts_avoid_pipelining =
hosts_max_try = 5
hosts_max_try_hardlimit = 50
-hosts_noproxy_tls = *
no_hosts_override
no_hosts_randomize
hosts_require_auth =
no_hosts_override
no_hosts_randomize
hosts_require_auth =