X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0..bf3e317e5a01916a351278597c6c0664ed198ddc:/test/confs/5400?ds=sidebyside

diff --git a/test/confs/5400 b/test/confs/5400
index 2bbe6965a..9693818b1 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,16 +1,17 @@
 # Exim test configuration 5400
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+# any options on the cutthrough_delivery control
+CONTROL=
+
+# optional verify-callout
+OPT=
+
+.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
-tls_advertise_hosts =
 
-log_selector = +received_recipients
+log_selector = +received_recipients +all_parents
+queue_only
 
 # ----- Main settings -----
 
@@ -24,13 +25,20 @@ acl_smtp_rcpt = ar
 begin acl
 
 ar:
-	accept control = cutthrough_delivery
+  accept
+	control = cutthrough_deliveryCONTROL
+	OPT
 	logwrite = rcpt for $local_part@$domain
 
 # ----- Routers -----
 
 begin routers
 
+redir:
+  driver = redirect
+  local_parts = ^r
+  data =	${substr_1:$local_part}@$domain
+
 dns:
   driver = dnslookup
   domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex
@@ -45,6 +53,7 @@ all:
   transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++
+  errors_to =	   ""
   no_more
 
 
@@ -56,12 +65,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =	:
   headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
 
 smtp2:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =	:
 
 
 # End