X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F4009;h=98f696f44d6605f2f119aed091f9fa598ad6c62d;hb=6336058cedeecb91a64ed69143b8b5221d08e16c;hp=b635195b61c60c2cd55444365852347e57c04b33;hpb=c5f280e20a8e3ecd5f016b8fb34a436588915ed2;p=exim.git

diff --git a/test/confs/4009 b/test/confs/4009
index b635195b6..98f696f44 100644
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,16 +1,14 @@
 # Exim test configuration 4009
 # Content-scan: spamassassin interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+OPT= 127.0.0.1 7833
+
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
-spamd_address = 127.0.0.1 7833
+spamd_address = OPT
 
 # ----- Main settings -----
 
@@ -23,7 +21,7 @@ c_data:
   warn
     spam = nobody
   warn
-    log_message = $spam_action $spam_report
+    log_message = $callout_address $spam_action $spam_report
   accept
 
 # ----- Routers -----