Revert "GnuTLS: lose DH-param setup, for recent library versions where no longer...

[exim.git] / test / confs / 5400

diff --git a/test/confs/5400 b/test/confs/5400
index f87f985fd299ce4aa994ada7e093cbfe149e16e9..9693818b1b091891287b082bd89ade81627a383b 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,10 +1,17 @@
 # Exim test configuration 5400
 
 # Exim test configuration 5400
 

+# any options on the cutthrough_delivery control
+CONTROL=
+
+# optional verify-callout
+OPT=
+

 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 

-log_selector = +received_recipients
+log_selector = +received_recipients +all_parents
+queue_only

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


@@ -18,13 +25,20 @@ acl_smtp_rcpt = ar
 begin acl
 
 ar:
 begin acl
 
 ar:

-       accept control = cutthrough_delivery
+  accept
+       control = cutthrough_deliveryCONTROL
+       OPT

        logwrite = rcpt for $local_part@$domain
 
 # ----- Routers -----
 
 begin routers
 
        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
 dns:
   driver = dnslookup
   domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex


@@ -51,12 +65,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   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
   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
 
 
 # End