Merge branch 'hs/fix-proxy-bh' (Closes 2656)

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

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index b8b130f7620eff82ea61405e7f561bb8731b2c54..ee2f5a849c339a24eb8f1ca77265d68d622a5f0f 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,13 +1,14 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
+       id 10HmbD-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmaY-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbD-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:
@@ -18,46 +19,47 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
-       id 10HmaX-0005vi-00
+       id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: userx@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 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>)
-       id 10HmbD-0005vi-00
+       id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: ok@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 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>)
-       id 10HmbF-0005vi-00
+       id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 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
+       id 10HmbJ-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 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:
@@ -66,14 +68,15 @@ checks incoming messages on this system. The following error was given:
 
 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
+       id 10HmbK-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbC-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbK-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:
@@ -85,10 +88,10 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
-       id 10HmbB-0005vi-00
+       id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: userx@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000