Support transport-added headers under cutthrough delivery. Bug 1431

[exim.git] / test / stderr / 5410

diff --git a/test/stderr/5410 b/test/stderr/5410
index 98ba3cb8fa30d37ea29aa3ee1674cfcc1abbff07..334301139792122ee7f4d28224e110f77cbbee7d 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -86,7 +86,8 @@ expanding: ${if eq {$address_data}{userz}{*}{:}}
          250-8BITMIME
          250-PIPELINING
          250 HELP
          250-8BITMIME
          250-PIPELINING
          250 HELP

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP<< 250 Accepted
   SMTP<< 250 OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP<< 250 Accepted


@@ -136,7 +137,8 @@ expanding:
        for $received_for
    result: 
        for userx@domain.com
        for $received_for
    result: 
        for userx@domain.com

-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------

 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .


@@ -218,7 +220,8 @@ skipping: result is not used
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Accepted
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Accepted


@@ -268,7 +271,8 @@ expanding:
        for $received_for
    result: 
        for usery@domain.com
        for $received_for
    result: 
        for usery@domain.com

-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------

 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .


@@ -350,7 +354,8 @@ skipping: result is not used
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Accepted
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Accepted


@@ -400,7 +405,8 @@ expanding:
        for $received_for
    result: 
        for usery@domain.com
        for $received_for
    result: 
        for usery@domain.com

-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------

 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .