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

[exim.git] / test / mail / 4620.fred[

diff --git a/test/mail/4620.fred[ b/test/mail/4620.fred[
index 3a6cf1f462abd1bd9157f5959201730ffdad62b5..9635c7dc6d3175fd544729a92b83384cc53ae466 100644 (file)
--- a/test/mail/4620.fred[
+++ b/test/mail/4620.fred[
@@ -1,20 +1,22 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)
-       id 10HmbE-0005vi-00
-       for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbE-000000005vi-0000
+       for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbD-0005vi-00
-       for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbD-000000005vi-0000
+       for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 To: "SRS0=ZZZZ=YY=test.ex=fred["@test.ex
-References: <E10HmbB-0005vi-00@the.local.host.name>
+References: <E10HmbB-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
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -44,13 +46,15 @@ Return-path: <"SRS0=ZZZZ=YY=test.ex=fred["@test.ex>
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <"SRS0=ZZZZ=YY=test.ex=fred["@test.ex>)
-       id 10HmbC-0005vi-00
-       for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbC-000000005vi-0000
+       for remote_user@remote.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by the.local.host.name with local (Exim x.yz)
        (envelope-from <"fred["@test.ex>)
-       id 10HmbB-0005vi-00
-       for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+       id 10HmbB-000000005vi-0000
+       for redirect@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-000000005vi-0000@the.local.host.name>
 From: "fred["@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000