summaryrefslogtreecommitdiff
path: root/test/stderr/5420
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-10-29 23:06:49 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2016-10-29 23:06:49 +0100
commit340f31131ec982ff70e943523f962438c5641e57 (patch)
treefa45e5700a2788bc89d15cb67afca95cd8a3fb85 /test/stderr/5420
parentb0fa97c1588ce368d0fd490472d2a7f552c45dbf (diff)
Testsuite: tidying
Diffstat (limited to 'test/stderr/5420')
-rw-r--r--test/stderr/542087
1 files changed, 24 insertions, 63 deletions
diff --git a/test/stderr/5420 b/test/stderr/5420
index 2817bdc33..e6247ce93 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -133,7 +133,7 @@ considering: ${tod_full}
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}}
@@ -141,7 +141,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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}}
@@ -151,19 +151,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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)
- }}}}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)
- }}}}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}}
@@ -174,7 +174,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(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}}
@@ -188,25 +188,12 @@ considering: (helo=$sender_helo_name)
condition: def:received_protocol
result: true
-considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
- }}(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}}
expanding: with $received_protocol
result: with local-esmtp
- condition: def:tls_cipher
- result: false
- scanning: ($tls_cipher)
- }}(Exim $version_number)
- ${if def:sender_address {(envelope-from <$sender_address>)
- }}id $message_exim_id${if def:received_for {
- for $received_for}}
- expanding: ($tls_cipher)
-
- result: ()
-
- skipping: result is not used
condition: def:sender_address
result: true
considering: (envelope-from <$sender_address>)
@@ -226,7 +213,7 @@ considering:
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}}
@@ -357,7 +344,7 @@ considering: ${tod_full}
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}}
@@ -365,7 +352,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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}}
@@ -375,19 +362,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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)
- }}}}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)
- }}}}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}}
@@ -398,7 +385,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(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}}
@@ -412,25 +399,12 @@ considering: (helo=$sender_helo_name)
condition: def:received_protocol
result: true
-considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
- }}(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}}
expanding: with $received_protocol
result: with local-esmtp
- condition: def:tls_cipher
- result: false
- scanning: ($tls_cipher)
- }}(Exim $version_number)
- ${if def:sender_address {(envelope-from <$sender_address>)
- }}id $message_exim_id${if def:received_for {
- for $received_for}}
- expanding: ($tls_cipher)
-
- result: ()
-
- skipping: result is not used
condition: def:sender_address
result: true
considering: (envelope-from <$sender_address>)
@@ -450,7 +424,7 @@ considering:
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}}
@@ -581,7 +555,7 @@ considering: ${tod_full}
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}}
@@ -589,7 +563,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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}}
@@ -599,19 +573,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
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)
- }}}}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)
- }}}}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}}
@@ -622,7 +596,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(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}}
@@ -636,25 +610,12 @@ considering: (helo=$sender_helo_name)
condition: def:received_protocol
result: true
-considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
- }}(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}}
expanding: with $received_protocol
result: with local-esmtp
- condition: def:tls_cipher
- result: false
- scanning: ($tls_cipher)
- }}(Exim $version_number)
- ${if def:sender_address {(envelope-from <$sender_address>)
- }}id $message_exim_id${if def:received_for {
- for $received_for}}
- expanding: ($tls_cipher)
-
- result: ()
-
- skipping: result is not used
condition: def:sender_address
result: true
considering: (envelope-from <$sender_address>)
@@ -674,7 +635,7 @@ considering:
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}}