Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 5410

diff --git a/test/stderr/5410 b/test/stderr/5410
index 471e0415672cc2d987acd4538ca328c286a345e8..bd1e5d26f282d0ab4cbae2c389ff38ae39030c22 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -31,6 +31,7 @@ try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)

+try option acl_smtp_atrn

 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn


@@ -71,7 +72,7 @@ try option acl_smtp_rcpt
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"

-processing "accept" (TESTSUITE/test-config 22)
+processing ACL cutthrough "accept" (TESTSUITE/test-config 22)

 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?


@@ -101,8 +102,8 @@ try option headers_remove
 try option transport
 try option unseen
 ----------- end verify ------------
 try option transport
 try option unseen
 ----------- end verify ------------

-accept: condition test succeeded in ACL "cutthrough"
-end of ACL "cutthrough": ACCEPT
+accept: condition test succeeded in ACL cutthrough
+end of ACL cutthrough: ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains
 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains


@@ -288,7 +289,7 @@ sync_responses expect rcpt for userx@domain.com
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata

-processing "accept" (TESTSUITE/test-config 57)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -530,7 +531,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩


@@ -567,7 +567,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩
  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩


@@ -708,6 +707,7 @@ try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)

+try option acl_smtp_atrn

 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn


@@ -748,7 +748,7 @@ try option acl_smtp_rcpt
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"

-processing "accept" (TESTSUITE/test-config 22)
+processing ACL cutthrough "accept" (TESTSUITE/test-config 22)

 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?


@@ -778,8 +778,8 @@ try option headers_remove
 try option transport
 try option unseen
 ----------- end verify ------------
 try option transport
 try option unseen
 ----------- end verify ------------

-accept: condition test succeeded in ACL "cutthrough"
-end of ACL "cutthrough": ACCEPT
+accept: condition test succeeded in ACL cutthrough
+end of ACL cutthrough: ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains
 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains


@@ -914,7 +914,7 @@ sync_responses expect rcpt for usery@domain.com
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata

-processing "accept" (TESTSUITE/test-config 57)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -1156,7 +1156,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩


@@ -1193,7 +1192,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩
  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩


@@ -1334,6 +1332,7 @@ try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  list element: *
   in limits_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)

+try option acl_smtp_atrn

 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
 try option acl_smtp_expn


@@ -1374,7 +1373,7 @@ try option acl_smtp_rcpt
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"
  ├───expanded: ${if░eq░{SERVER}{server}{queue}{cutthrough}}
  ╰─────result: cutthrough
 using ACL "cutthrough"

-processing "accept" (TESTSUITE/test-config 22)
+processing ACL cutthrough "accept" (TESTSUITE/test-config 22)

 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in domains?


@@ -1404,8 +1403,8 @@ try option headers_remove
 try option transport
 try option unseen
 ----------- end verify ------------
 try option transport
 try option unseen
 ----------- end verify ------------

-accept: condition test succeeded in ACL "cutthrough"
-end of ACL "cutthrough": ACCEPT
+accept: condition test succeeded in ACL cutthrough
+end of ACL cutthrough: ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains
 ----------- start cutthrough setup ------------
 domain.com in domains?
  list element: !░+local_domains


@@ -1540,7 +1539,7 @@ sync_responses expect rcpt for usery@domain.com
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
 try option acl_smtp_predata

-processing "accept" (TESTSUITE/test-config 57)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -1782,7 +1781,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
  ␉}}(Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩


@@ -1819,7 +1817,6 @@ try option received_header_text
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 

-            ╰──(tainted)

  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩
  ├considering: (Exim░$version_number)↩
  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ␉}}id░$message_exim_id${if░def:received_for░{↩