git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cutthrough: option to use transport-defined mailfrom. Bug 3071
[exim.git] / test / stdout / 4052
diff --git a/test/stdout/4052 b/test/stdout/4052
index c84be25a525b9555ea9d5d4ea92b85c60d880dde..541164ca2b8767d2c1fff6362a39b18a304f1ee6 100644 (file)
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -8,7 +8,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -18,10 +18,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbD-0005vi-00
+       id 10HmbD-000000005vi-0000
        for nocache2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for nocache2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -38,7 +38,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -48,10 +48,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbE-0005vi-00
+       id 10HmbE-000000005vi-0000
        for withcache2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for withcache2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbE-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -84,7 +84,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -94,10 +94,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbG-0005vi-00
+       id 10HmbG-000000005vi-0000
        for nocache3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for nocache3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbG-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -114,7 +114,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -124,10 +124,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbH-0005vi-00
+       id 10HmbH-000000005vi-0000
        for withcache3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for withcache3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbH-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -148,7 +148,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -167,7 +167,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -186,7 +186,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
@@ -202,7 +202,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -212,10 +212,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbO-0005vi-00
+       id 10HmbO-000000005vi-0000
        for withcache23@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for withcache23@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbO-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -232,7 +232,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250-SIZE
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250-SIZE
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
@@ -243,10 +243,10 @@ Connection request from [127.0.0.1]
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 >354 data go-ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmbP-0005vi-00
+       id 10HmbP-000000005vi-0000
        for extchange@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for extchange@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbP-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
Master Exim source repository