Test for proper parsing of optional MAIL FROM args.

[exim.git] / test / stdout / 0254

diff --git a/test/stdout/0254 b/test/stdout/0254
index 947c4e0c5660dcf99b01855b40e4274b037d21ec..3e044dd6f3123279ba067e33de9debee376c5d35 100644 (file)
--- a/test/stdout/0254
+++ b/test/stdout/0254
@@ -20,6 +20,7 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* To: t
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* To: t


@@ -32,7 +33,6 @@ ddd* Resent-To: t
 028T Resent-To: t@myhost.test.ex
 015  Resent-Date: d
 033  Resent-Subject: should not exist
 028T Resent-To: t@myhost.test.ex
 015  Resent-Date: d
 033  Resent-Subject: should not exist

-054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID


@@ -56,13 +56,13 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* Resent-From: f
 dddF Resent-From: f@myhost.test.ex
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* Resent-From: f
 dddF Resent-From: f@myhost.test.ex

-054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>

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

 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>
 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>


@@ -85,6 +85,8 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 ddd* From: userx
 dddF From: userx@myhost.test.ex
 ddd* To: xx@yy
 ddd* From: userx
 dddF From: userx@myhost.test.ex
 ddd* To: xx@yy


@@ -93,6 +95,4 @@ ddd* Resent-From: userx
 dddF Resent-From: userx@myhost.test.ex
 ddd* Resent-To: xx@yy
 021T Resent-To: xxxx@yyyy
 dddF Resent-From: userx@myhost.test.ex
 ddd* Resent-To: xx@yy
 021T Resent-To: xxxx@yyyy

-054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>

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