Testsuite: track newer GnuTLS behaviour

[exim.git] / test / confs / 2113

diff --git a/test/confs/2113 b/test/confs/2113
index d5be248615d607c25bb70e499ddb2af7a8c9993a..95b6842a95ad83f15b811ca451f42374a14a510c 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -2,20 +2,15 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 
 # ----- Main settings -----
 
 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
 
 queue_only
 queue_run_in_order


@@ -34,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}}


@@ -59,7 +63,9 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

+  hosts_override

   hosts = 127.0.0.1
   hosts = 127.0.0.1

+  hosts_noproxy_tls = :

   port = PORT_D
   tls_try_verify_hosts = :
 
   port = PORT_D
   tls_try_verify_hosts = :