Merge branch 'exim-4.96+security' into master+security

[exim.git] / test / confs / 0285

diff --git a/test/confs/0285 b/test/confs/0285
index c06762dab133d1721394af21aef6bd60b03598b8..20ec0263aeb345fad8bef5ac8ae96e3944382621 100644 (file)
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -1,12 +1,8 @@
 # Exim test configuration 0285
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -27,7 +23,7 @@ all:
   driver = manualroute
   route_list = * 127.0.0.1 byname
   self = send
-  transport = smtp
+  transport = ${if eq {$domain}{test.ex} {smtp}{magic_smtp}}
 
 
 # ----- Transports -----
@@ -35,9 +31,17 @@ all:
 begin transports
 
 smtp:
-  driver = smtp
-  port = PORT_S
-  max_rcpt = 2
+  driver =     smtp
+  port =       PORT_S
+  hosts_try_fastopen = :
+  max_rcpt =   2
+  connection_max_messages = 3
+
+magic_smtp:
+  driver =     smtp
+  port =       PORT_S
+  hosts_try_fastopen = :
+  max_rcpt =   ${if match {$domain}{magic(\\d+)} {$1} {2}}
   connection_max_messages = 3