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

[users/heiko/exim.git] / test / confs / 4600

diff --git a/test/confs/4600 b/test/confs/4600
index 2934bf160386330c703974e87842ca9f961a785e..34baa999b373aee3b8bc9f492a70d073532cd159 100644 (file)
--- a/test/confs/4600
+++ b/test/confs/4600
@@ -11,16 +11,16 @@ acl_smtp_rcpt = check_rcpt
 begin acl
 
 check_rcpt:
 begin acl
 
 check_rcpt:

-  accept       hosts =         HOSTIPV4
+  accept       condition =     ${if eq {$received_port}{PORT_D}}

                spf_guess =     pass
                spf_guess =     pass

-               logwrite =      spf_result         $spf_result
+               logwrite =      spf_result         $spf_result (guess <$spf_result_guessed>)

                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment
                logwrite =      spf_received       $spf_received
                logwrite =      ${authresults {$primary_hostname}}
 
                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment
                logwrite =      spf_received       $spf_received
                logwrite =      ${authresults {$primary_hostname}}
 

-  accept       hosts =         127.0.0.1
-               spf =           pass : softfail : neutral
+  accept       condition =     ${if eq {$received_port}{PORT_S}}
+               spf =           pass : softfail : neutral : none

                logwrite =      spf_result         $spf_result
                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment
                logwrite =      spf_result         $spf_result
                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment


@@ -28,7 +28,7 @@ check_rcpt:
                logwrite =      ${authresults {$primary_hostname}}
 
   deny
                logwrite =      ${authresults {$primary_hostname}}
 
   deny

-               logwrite =      spf_result         $spf_result
+               logwrite =      spf_result         $spf_result (guess <$spf_result_guessed>)

                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment
                logwrite =      spf_received       $spf_received
                logwrite =      spf_header_comment $spf_header_comment
                logwrite =      spf_smtp_comment   $spf_smtp_comment
                logwrite =      spf_received       $spf_received