Testsuite: munge recorded TLS version &c in output to permit awkward test-host instal...

[exim.git] / test / mail / 0021.userx

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index e8f147a4f9dd598704cf9c95126db3a0dd3d72c2..2abd8d3150adc6474e3b389cb3fcfacf84ee8021 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,12 +1,12 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)

-       id 10HmbA-0005vi-00
+       id 10HmbC-0005vi-00

        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code

-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that


@@ -29,9 +29,9 @@ Test message 1.
 From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test1>)
 From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test1>)

-       id 10HmbB-0005vi-00
+       id 10HmbD-0005vi-00

        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>

 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 


@@ -40,11 +40,55 @@ Test message 2.
 From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test3>)
 From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test3>)

-       id 10HmbD-0005vi-00
+       id 10HmbF-0005vi-00

        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>

 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 4.
 
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 4.
 

+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbI-0005vi-00
+       for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: userx@test1
+Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message that you sent was rejected by the local scanning code that
+checks incoming messages on this system. The following error was given:
+
+  don't like sender userx@test1
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbJ-0005vi-00
+       for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: userx@test1
+Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message that you sent was rejected by the local scanning code that
+checks incoming messages on this system. The following error was given:
+
+  don't like sender userx@test1
+
+------ This is a copy of the headers that were received before the error
+       was detected.
+
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       (envelope-from <userx@test1>)
+       id 10HmbB-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+From: userx@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+