X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/2b8b8e4ed5cbebd3884c301d438d72ea24fbfd70..d901e231acd1917d24b688cbd7823efc2bed45c4:/test/confs/4600?ds=inline diff --git a/test/confs/4600 b/test/confs/4600 index d93b683d9..34baa999b 100644 --- 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