Taint: fix ACL "spam" condition, to permit tainted name arguments.

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

diff --git a/test/confs/2008 b/test/confs/2008
index a84ced8a29eade733dfdf81b4683ce048c216c65..0fd5186acdd9b7c200231bcb31d139b8b8d65e27 100644 (file)
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----
@@ -60,7 +55,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
@@ -69,6 +64,7 @@ send_to_server1:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen = :
   helo_data = helo.data.changed
 
 send_to_server2:
@@ -76,6 +72,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
 
 
 # ----- Retry -----