Fix multi-method query-style lookup quoters

[exim.git] / test / confs / 0610

diff --git a/test/confs/0610 b/test/confs/0610
index a68b4ebee40a924e38590f3595a8cdee17d86403..370391b9579ead0731809ce53e48785de416ead4 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -2,16 +2,10 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -27,16 +21,24 @@ queue_run_in_order
 begin acl
 
 conn_chk:
+.ifdef DELAY
   defer        condition = ${if eq {SERVER}{server}}
+.endif
   accept
 
 # ----- Routers -----
 
 begin routers
 
-client:
+r1:
+  driver = accept
+  condition = ${if eq {t1}{$sender_address_local_part}}
+  transport = t1
+
+r2:
   driver = accept
-  transport = $sender_address_local_part
+  condition = ${if eq {t2}{$sender_address_local_part}}
+  transport = t2
 
 # ----- Transports -----
 
@@ -48,19 +50,21 @@ t1:
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1
+  hosts_try_fastopen = :
 
 t2:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.2
+  interface = HOSTIPV4
+  hosts_try_fastopen = :
 
 # ----- Retry -----
 
 begin retry
 
-* * F,5d,10s
+* * F,5d,1s
 
 # End