Attempt (2) egrep compat for Solaris vs. Linux

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

diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 825e700abcfe3dfce34aa19dc9511d8a828306e1..45619c2669e75a66c12a7c1ea9e11b1750016bff 100644 (file)
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -5,8 +5,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex
 
 test message data
@@ -18,8 +19,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
-       id 10HmaY-0005vi-00
-       for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for postmaster@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex
 
@@ -29,12 +31,14 @@ From postmaster@exim.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
-       id 10HmaZ-0005vi-00
-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-000000005vi-0000
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 sysmail: yes
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: postmaster@exim.test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -45,12 +49,14 @@ Return-path: <>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-       id 10HmbA-0005vi-00
-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@exim.test.ex
-In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
+In-Reply-To: <E10HmaZ-000000005vi-0000@the.local.host.name>
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 From: CALLER@exim.test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000