X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/743c4c9f5a8ecd10fb91fff283d949ca9d12e2fb..4ec0fcb6737da9bc2603056d56fbf6e41e061967:/test/confs/4600 diff --git a/test/confs/4600 b/test/confs/4600 index ba2135943..34baa999b 100644 --- a/test/confs/4600 +++ b/test/confs/4600 @@ -1,7 +1,5 @@ # Exim test configuration 4600 -SERVER= - .include DIR/aux-var/std_conf_prefix primary_hostname = myhost.test.ex @@ -10,31 +8,30 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = check_rcpt -queue_only -queue_run_in_order - - 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