Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 2131

diff --git a/test/confs/2131 b/test/confs/2131
index c52ceed0cbc6d4e0edac84278895e8d830a9c1a8..3d83099d10ced09cc4a9d15f6a7e37236f171da9 100644 (file)
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -1,4 +1,4 @@
-# Exim test configuration 2130
+# Exim test configuration 2131
 # SNI
 
 SERVER =
@@ -6,7 +6,6 @@ SERVER =
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
@@ -18,7 +17,7 @@ gecos_name = CALLER_NAME
 domainlist local_domains = test.ex : *.test.ex
 
 acl_smtp_rcpt = acl_log_sni
-log_selector = +tls_peerdn +tls_sni
+log_selector = +tls_peerdn +tls_sni +received_recipients
 remote_max_parallel = 1
 
 tls_advertise_hosts = *
@@ -73,6 +72,7 @@ send_to_server1:
   port = PORT_D
   tls_sni = fred
   hosts_require_tls = *
+  tls_try_verify_hosts = :
 
 send_to_server2:
   driver = smtp
@@ -81,6 +81,7 @@ send_to_server2:
   port = PORT_D
   tls_sni = bill
   hosts_require_tls = *
+  tls_try_verify_hosts = :
 
 
 # ----- Retry -----