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

[exim.git] / test / mail / 4520.f

diff --git a/test/mail/4520.f b/test/mail/4520.f
index a6e05a7d766e7f63d693a7ea2fa34202344c271c..4e6d96d084a5beeb8212ddb8473cb4eecd044da1 100644 (file)
--- a/test/mail/4520.f
+++ b/test/mail/4520.f
@@ -2,7 +2,7 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
        by myhost.test.ex with esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
        by myhost.test.ex with esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmbO-0005vi-00
+       id 10HmbP-0005vi-00

        for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
        s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK
        for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
        s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK


@@ -11,10 +11,10 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
        t2W/iI=;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        t2W/iI=;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmbN-0005vi-00
+       id 10HmbO-0005vi-00

        for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
        for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com

-Message-Id: <E10HmbN-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>

 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000