X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F0610;h=49778352f87ababc5bbb625d9208f19f9a89d213;hb=2e5d9e711eef27badbff206e17238661d14cc7c2;hp=a68b4ebee40a924e38590f3595a8cdee17d86403;hpb=23f3dc67a13f71bb8fdf2930052d3fdce85e9774;p=exim.git

diff --git a/test/confs/0610 b/test/confs/0610
index a68b4ebee..49778352f 100644
--- 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 -----
 
@@ -34,9 +28,15 @@ conn_chk:
 
 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 -----
 
@@ -54,7 +54,7 @@ t2:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.2
+  interface = HOSTIPV4
 
 # ----- Retry -----