Merge branch 'master'

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

diff --git a/test/confs/4009 b/test/confs/4009
index 2799575eadfad797c6d5af039bfdf275032dfad5..45f95edc228870bec8df1ccba0dbb473c677de51 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -4,12 +4,14 @@
 OPT= 127.0.0.1 7833
 
 exim_path = EXIM_PATH
+keep_environment =
 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
+tls_advertise_hosts =
 log_selector = +subject
 
 spamd_address = OPT
@@ -25,7 +27,7 @@ c_data:
   warn
     spam = nobody
   warn
-    log_message = $spam_action $spam_report
+    log_message = $callout_address $spam_action $spam_report
   accept
 
 # ----- Routers -----