Docs: combine option definitions

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

diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index deffea8fce63b5afa28f026897f8903924754370..6aab72488900c8aa5bed22dddacfe897d53a77f9 100644 (file)
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -1,8 +1,10 @@
 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>)
-       id 10HmaX-0005vi-00
-       for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for rcptok@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 cond: accept
 X-Data-2: Line two
 X-Data-5: Line five
@@ -22,7 +24,10 @@ X-Predata-2: Line nineteen
 X-NotSMTP-1: Line twenty-one
 X-NotSMTP-2: Line twenty-two
 X-NotSMTP-3: Line twenty-three
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Authentication-Results: keep.org; baz barf
+Authentication-Results: keep.org;
+       multiline
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 From: mailok@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 RCPT: denied notok
@@ -32,9 +37,10 @@ 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>)
-       id 10HmaY-0005vi-00
-       for rcptok@test.ex; 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>
 
 Test non-SMTP message.  Make sure it doesn't blow up when a header