SOCKS: support option expansion result for no-proxy. Bug 3118

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

diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index e29b128327fd734b9ec4ca24117f6f386cc385f4..c77fa795a6cafbcc2096b02ba1236912349cf3e6 100644 (file)
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -1,13 +1,15 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbE-0005vi-00
-       for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+       id 10HmbF-000000005vi-0000
+       for ok@test2;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
+References: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbF-000000005vi-0000@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,24 +20,27 @@ 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 <ok@test2>)
-       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: <E10HmaY-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: ok@test2
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbG-0005vi-00
-       for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+       id 10HmbH-000000005vi-0000
+       for ok@test4;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
+References: <E10HmbA-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbH-000000005vi-0000@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:
@@ -46,11 +51,12 @@ 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 <ok@test4>)
-       id 10HmaZ-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: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmbA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 From: ok@test4
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 5.