Testsuite: Fix 608

[exim.git] / test / rejectlog / 0507

diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index ca6243bd3b79f909dcc8c963f715d957766ca079..3c72ebdfdeb1ceb8d9c416f7e448bca308b2e01b 100644 (file)
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -1,10 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 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>)
        id 10HmaX-0005vi-00
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00

-       for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@dom.com;
+       Tue, 2 Mar 1999 09:44:33 +0000

 T To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 T To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>


@@ -12,10 +14,12 @@ F From: CALLER_NAME <CALLER@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 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>)
        id 10HmaY-0005vi-00
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00

-       for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@dom.com;
+       Tue, 2 Mar 1999 09:44:33 +0000

 T To: a@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 T To: a@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>


@@ -25,9 +29,11 @@ Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>
 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; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-0005vi-00;
+       Tue, 2 Mar 1999 09:44:33 +0000

 T To: a@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
 T To: a@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