X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/ad42405613da5439cab19b4c713f000eb9cb1d2e..74e2fb4be74f740608476cd042061000e198cc3d:/test/stderr/0402

diff --git a/test/stderr/0402 b/test/stderr/0402
index 96f012a15..9aa1f596e 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -46,8 +46,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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}}
@@ -55,8 +54,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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}}
@@ -66,22 +64,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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}}
@@ -92,8 +87,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}}
@@ -107,25 +101,12 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
      result: from CALLER 
   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
-  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>)
@@ -146,8 +127,7 @@ considering: (envelope-from <$sender_address>)
    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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}}