X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/dfbcb5ac660065b097b0ad0cb2c26357899f0c64..18a352ae8a799bb7be3a03b14bbf3ce9e0ba4945:/test/confs/4600 diff --git a/test/confs/4600 b/test/confs/4600 index 2934bf160..34baa999b 100644 --- a/test/confs/4600 +++ b/test/confs/4600 @@ -11,16 +11,16 @@ 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 @@ -28,7 +28,7 @@ check_rcpt: 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