Merge branch 'master' into 4.next

[exim.git] / test / confs / 4009

diff --git a/test/confs/4009 b/test/confs/4009
index 2799575eadfad797c6d5af039bfdf275032dfad5..dd21a218387e777036fadc05c97591241004c3c4 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -3,14 +3,13 @@
 
 OPT= 127.0.0.1 7833
 
 
 OPT= 127.0.0.1 7833
 

-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
+.include DIR/aux-var/std_conf_prefix
+

 log_selector = +subject
 log_selector = +subject

+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER

 
 spamd_address = OPT
 
 
 spamd_address = OPT
 


@@ -25,7 +24,7 @@ c_data:
   warn
     spam = nobody
   warn
   warn
     spam = nobody
   warn

-    log_message = $spam_action $spam_report
+    log_message = $callout_address $spam_action $spam_report

   accept
 
 # ----- Routers -----
   accept
 
 # ----- Routers -----