Fix -bi. Bug 2590

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

diff --git a/test/confs/4600 b/test/confs/4600
index d93b683d9515060480d3b786467dd38a6c31a303..34baa999b373aee3b8bc9f492a70d073532cd159 100644 (file)
--- a/test/confs/4600
+++ b/test/confs/4600
@@ -11,24 +11,27 @@ acl_smtp_rcpt = check_rcpt
 begin acl
 
 check_rcpt:
-  accept       hosts =         HOSTIPV4
+  accept       condition =     ${if eq {$received_port}{PORT_D}}
                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}}
 
-  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_received       $spf_received
+               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 =      ${authresults {$primary_hostname}}
 
 # End