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

[exim.git] / test / stdout / 0440

diff --git a/test/stdout/0440 b/test/stdout/0440
index 22057e92d65052e714542d8ad5eeb5ae1ec425ef..59fb726c35aaef0d2bfcc878f98cae127a7dcfb4 100644 (file)
--- a/test/stdout/0440
+++ b/test/stdout/0440
@@ -13,10 +13,10 @@ DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000

        for x1@y1;
        Tue, 2 Mar 1999 09:44:33 +0000
        for x1@y1;
        Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 


@@ -25,38 +25,38 @@ First message
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 OK
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 OK

-RCPT TO:<x3@y3>
+RCPT TO:<x2@y2>

 250 OK
 DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 250 OK
 DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaZ-0005vi-00
-       for x3@y3;
+       id 10HmaY-000000005vi-0000
+       for x2@y2;

        Tue, 2 Mar 1999 09:44:33 +0000
        Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-Third message
+Second message

 .
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 OK
 .
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 OK

-RCPT TO:<x2@y2>
+RCPT TO:<x3@y3>

 250 OK
 DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 250 OK
 DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaY-0005vi-00
-       for x2@y2;
+       id 10HmaZ-000000005vi-0000
+       for x3@y3;

        Tue, 2 Mar 1999 09:44:33 +0000
        Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-Second message
+Third message

 .
 250 OK
 QUIT
 .
 250 OK
 QUIT