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

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

diff --git a/test/confs/2000 b/test/confs/2000
index b1999124ee4c146983b73d051d0afa94be648312..11104b09da346d44a68b89f43d9937d81814f96a 100644 (file)
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -21,6 +16,8 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
+# needed to force generation
+tls_dhparam = historic
 
 # Set certificate only if server
 
@@ -51,9 +48,11 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2
+  tls_try_verify_hosts =
 
 
 # ----- Retry -----