tidying

[exim.git] / test / mail / 0532.rcptok

diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index 4685a414f62a47a2ec126adf8defbbdcf4d1680c..7ed1a2e7563a4caab5495a25824a34ef1d277e89 100644 (file)
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -1,12 +1,14 @@
 From mailok@test.ex Tue Mar 02 09:44:33 1999
 From mailok@test.ex Tue Mar 02 09:44:33 1999

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

        (envelope-from <mailok@test.ex>)
        (envelope-from <mailok@test.ex>)

-       id 10HmaX-0005vi-00
-       for rcptok@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>
+       id 10HmaX-000000005vi-0000
+       for rcptok@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 cond: accept
 cond: accept

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

 From: mailok@test.ex
 From: mailok@test.ex

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 MAIL: one
 MAIL: two
 MAIL: three
 MAIL: one
 MAIL: two
 MAIL: three


@@ -26,11 +28,12 @@ Test message
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaY-0005vi-00
-       for rcptok@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 10HmaY-000000005vi-0000
+       for rcptok@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 NOTSMTP: rcptok@test.ex
 
 Test non-SMTP message.
 NOTSMTP: rcptok@test.ex
 
 Test non-SMTP message.