Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / confs / 2113

diff --git a/test/confs/2113 b/test/confs/2113
index f2c49c9b8941625533a37fefdb08f4c7ba53e492..95b6842a95ad83f15b811ca451f42374a14a510c 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -10,7 +10,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 +29,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 +63,9 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
+  hosts_override
   hosts = 127.0.0.1
+  hosts_noproxy_tls = :
   port = PORT_D
   tls_try_verify_hosts = :