git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: munge and shuffle for non-TLS build
[exim.git] / test / mail / 4700.CALLER
diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
index bde98db7d755278023d6676fc3eb0de1b779cab3..cb06a4a3982375c784e5164042386fff7b67038a 100644 (file)
--- a/test/mail/4700.CALLER
+++ b/test/mail/4700.CALLER
@@ -1,16 +1,18 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmaY-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -37,7 +39,6 @@ Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 550 Go away
 Remote-MTA: dns; localhost4.test.ex
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 550 Go away
-X-Exim-Diagnostic: X-str; SMTP error from remote mail server after initial connection: 550 Go away
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -46,9 +47,10 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000
+       for userx@domain1;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -59,17 +61,19 @@ Test message 1
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbA-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -101,7 +105,6 @@ Remote-MTA: dns; localhost4.test.ex
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
 X-Remote-MTA-helo-response: X-str; 550 Go away
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
 X-Remote-MTA-helo-response: X-str; 550 Go away
-X-Exim-Diagnostic: X-str; SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
 Diagnostic-Code: smtp; 550 Go away
 
 Action: failed
 Diagnostic-Code: smtp; 550 Go away
 
 Action: failed
@@ -111,7 +114,6 @@ Remote-MTA: dns; localhost4.test.ex
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
 X-Remote-MTA-helo-response: X-str; 550 Go away
 Remote-MTA: X-ip; [127.0.0.1]:1111
 X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
 X-Remote-MTA-helo-response: X-str; 550 Go away
-X-Exim-Diagnostic: X-str; SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -120,8 +122,9 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+       id 10HmaZ-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
Master Exim source repository