X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/743c4c9f5a8ecd10fb91fff283d949ca9d12e2fb..dfbcb5ac660065b097b0ad0cb2c26357899f0c64:/test/confs/4600 diff --git a/test/confs/4600 b/test/confs/4600 index ba2135943..2934bf160 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,10 +8,6 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = check_rcpt -queue_only -queue_run_in_order - - begin acl check_rcpt: @@ -23,6 +17,7 @@ check_rcpt: 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 @@ -30,11 +25,13 @@ check_rcpt: 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_header_comment $spf_header_comment logwrite = spf_smtp_comment $spf_smtp_comment logwrite = spf_received $spf_received + logwrite = ${authresults {$primary_hostname}} # End