Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / rejectlog / 0585

diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index ef368aff7b644efb77ca8e054c0b5ab0bcff08e8..4767d309468aec3d7433bc26348be7eb1ad250d3 100644 (file)
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -1,39 +1,42 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected

 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000

        for userx@dom.com;
        Tue, 2 Mar 1999 09:44:33 +0000
 T To: b@b.c, himself <usery@dom.com>
        for userx@dom.com;
        Tue, 2 Mar 1999 09:44:33 +0000
 T To: b@b.c, himself <usery@dom.com>

-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000

-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected

 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000

        for userx@dom.com;
        Tue, 2 Mar 1999 09:44:33 +0000
 T To: c@b.c, himself <usery@dom.com>
        for userx@dom.com;
        Tue, 2 Mar 1999 09:44:33 +0000
 T To: c@b.c, himself <usery@dom.com>

-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000

-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected

 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaZ-0005vi-00;
+       id 10HmaZ-000000005vi-0000;

        Tue, 2 Mar 1999 09:44:33 +0000
 T To: e@b.c, himself <UserY@dom.com>
 * Cc: unqualified, UserX@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, UserX@dom.com, x@y.z
        Tue, 2 Mar 1999 09:44:33 +0000
 T To: e@b.c, himself <UserY@dom.com>
 * Cc: unqualified, UserX@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, UserX@dom.com, x@y.z

-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000