Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

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

diff --git a/test/confs/4009 b/test/confs/4009
index b635195b61c60c2cd55444365852347e57c04b33..45f95edc228870bec8df1ccba0dbb473c677de51 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,16 +1,20 @@
 # Exim test configuration 4009
 # Content-scan: spamassassin interface
 
+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 = 127.0.0.1 7833
+spamd_address = OPT
 
 # ----- Main settings -----
 
@@ -23,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 -----