X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2013;h=4c9fcd3e8ca221099529f7813afd79e75e44cc21;hb=2e5d9e711eef27badbff206e17238661d14cc7c2;hp=ebd2536915c5eb5a0e5ef9a1382ccc0220b0ad36;hpb=4fab92fbc2b63bac2d89c1dae69fa1845cb640b7;p=exim.git

diff --git a/test/confs/2013 b/test/confs/2013
index ebd253691..4c9fcd3e8 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -1,6 +1,7 @@
 # Exim test configuration 2013
 
 SERVER =
+PEX = :
 
 .include DIR/aux-var/tls_conf_prefix
 
@@ -10,7 +11,7 @@ primary_hostname = myhost.test.ex
 
 acl_smtp_rcpt = accept
 
-log_selector = +tls_peerdn+smtp_connection+incoming_port
+log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
 
 queue_only
 queue_run_in_order
@@ -29,6 +30,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 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}}
@@ -54,7 +64,10 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
+  hosts_override
   hosts = 127.0.0.1
+  hosts_noproxy_tls = PEX
   port = PORT_D
+  tls_try_verify_hosts = :
 
 # End