Sync 4.next from master

[users/jgh/exim.git] / test / confs / 4009

diff --git a/test/confs/4009 b/test/confs/4009
index b635195b61c60c2cd55444365852347e57c04b33..dd21a218387e777036fadc05c97591241004c3c4 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,16 +1,17 @@
 # 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
+
+# we need to set the sender
+trusted_users = CALLER
 
-spamd_address = 127.0.0.1 7833
+spamd_address = OPT
 
 # ----- Main settings -----
 
@@ -23,7 +24,7 @@ c_data:
   warn
     spam = nobody
   warn
-    log_message = $spam_action $spam_report
+    log_message = $callout_address $spam_action $spam_report
   accept
 
 # ----- Routers -----