ACL: Fix parsing of control=queue_only

[users/jgh/exim.git] / test / confs / 0610

diff --git a/test/confs/0610 b/test/confs/0610
index 23c5b2cbdbd4b1c340f6b91b78e90eed8dcd98ca..5ce2723aeee6f2f083533362c63b3d76217b3e28 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -2,16 +2,10 @@
 
 SERVER =
 
 
 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
 rfc1413_query_timeout = 0s

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog

 log_selector = +sender_on_delivery
 log_selector = +sender_on_delivery

-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -34,9 +28,15 @@ conn_chk:
 
 begin routers
 
 
 begin routers
 

-client:
+r1:
+  driver = accept
+  condition = ${if eq {t1}{$sender_address_local_part}}
+  transport = t1
+
+r2:

   driver = accept
   driver = accept

-  transport = $sender_address_local_part
+  condition = ${if eq {t2}{$sender_address_local_part}}
+  transport = t2

 
 # ----- Transports -----
 
 
 # ----- Transports -----
 


@@ -48,6 +48,7 @@ t1:
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp


@@ -55,6 +56,7 @@ t2:
   hosts = 127.0.0.1
   port = PORT_D
   interface = HOSTIPV4
   hosts = 127.0.0.1
   port = PORT_D
   interface = HOSTIPV4

+  hosts_try_fastopen = :

 
 # ----- Retry -----
 
 
 # ----- Retry -----