Merge branch 'master' into 4.next

[exim.git] / test / confs / 2013

diff --git a/test/confs/2013 b/test/confs/2013
index 45d683cb4265e0e4106e60e73a58b9fad631901d..208e17c41152f318dd9a6fd1115c07c190698018 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -29,6 +29,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 begin routers
 
 
 begin routers
 

+.ifdef REQUIRE
+cl_override:
+  driver = manualroute
+  route_data = HOSTIPV4
+  retry_use_local_part
+  transport = send_to_server
+  self = send
+.endif
+

 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}
 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}


@@ -54,8 +63,10 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

+  hosts_override

   hosts = 127.0.0.1
   hosts_noproxy_tls = :
   port = PORT_D
   hosts = 127.0.0.1
   hosts_noproxy_tls = :
   port = PORT_D

+  tls_try_verify_hosts = :

 
 # End
 
 # End