SPF: fix handling mix of spf and other txt records. Bug 2499

[exim.git] / test / mail / 0351.userx

diff --git a/test/mail/0351.userx b/test/mail/0351.userx
index a0e4872f97791741e8b56c3582e8f39f349c6b27..41b34c002bc307a80ede45870c70ee699e1a2861 100644 (file)
--- a/test/mail/0351.userx
+++ b/test/mail/0351.userx
@@ -3,6 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex


@@ -13,13 +15,10 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u

-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

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

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

 Found: yes
 Found2: yes
 FOUND-found2: !!
 Found: yes
 Found2: yes
 FOUND-found2: !!

-

 TO: userx@test.ex,
 usery@test.ex
 --------------------------------
 TO: userx@test.ex,
 usery@test.ex
 --------------------------------


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

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

 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex


@@ -49,9 +50,7 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u

-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

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

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

 Found: yes
 Found2: yes
 
 Found: yes
 Found2: yes