Fix ESMTP MAIL command option processing

[users/heiko/exim.git] / test / mail / 0412.CALLER

diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER
index 89b8a60fef1e1f196598879b446b027d54bda827..410121dae18b82ddf3ead8b952b3515829556ede 100644 (file)
--- a/test/mail/0412.CALLER
+++ b/test/mail/0412.CALLER
@@ -3,11 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

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

+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 Found: no

-

 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex>
 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex>


@@ -20,12 +19,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>
 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>

+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 Found: no

-

 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex>
 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex>


@@ -38,12 +36,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>
 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>

+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 Found: no

-

 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: usery@test.ex
 FROM: CALLER_NAME <CALLER@test.ex>
 --------------------------------
 REPLY_ADDRESS: usery@test.ex


@@ -56,12 +53,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 From:
 From:

+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

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

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

 Found: no
 Found: no

-

 FROM: 
 --------------------------------
 REPLY_ADDRESS: 
 FROM: 
 --------------------------------
 REPLY_ADDRESS: