X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/ef8176594c130feebefad040420fbc4d637e9571..b999c48327cd31b50bfdbda9ce6a23ea3ee25730:/test/stderr/5420?ds=sidebyside

diff --git a/test/stderr/5420 b/test/stderr/5420
index a3c140012..8ccf0fd6c 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -49,7 +49,7 @@ considering: $local_part
   expanding: $local_part
      result: userx
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
@@ -133,8 +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}} ${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}}
@@ -142,8 +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}} ${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}}
@@ -153,22 +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}} ${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}}
@@ -179,8 +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}} ${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}}
@@ -194,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>)
@@ -232,8 +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}} ${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}}
@@ -252,6 +232,7 @@ considering: ${tod_full}
 LOG: MAIN
   >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
   SMTP>> QUIT
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -312,7 +293,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
@@ -364,8 +345,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}}
@@ -373,8 +353,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}}
@@ -384,22 +363,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}}
@@ -410,8 +386,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}} ${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}}
@@ -425,25 +400,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>)
@@ -463,8 +425,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}} ${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}}
@@ -483,6 +444,7 @@ considering: ${tod_full}
 LOG: MAIN
   >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
   SMTP>> QUIT
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -543,7 +505,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
@@ -595,8 +557,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}}
@@ -604,8 +565,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}}
@@ -615,22 +575,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}}
@@ -641,8 +598,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}} ${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}}
@@ -656,25 +612,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>)
@@ -694,8 +637,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}} ${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}}
@@ -714,6 +656,7 @@ considering: ${tod_full}
 LOG: MAIN
   >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
   SMTP>> QUIT
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN