TLS: use RFC 6125 rules for certifucate name checks when CNAMES are present....

[exim.git] / test / confs / 2017

diff --git a/test/confs/2017 b/test/confs/2017
index 14c724546cc49e742d9f30500558443f44d08f19..01612ef729885380e15356e83150f44e8bef3d49 100644 (file)
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -2,14 +2,9 @@
 
 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 -----
 
 
 # ----- Main settings -----
 


@@ -50,7 +45,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 


@@ -58,8 +53,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_nopass_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_nopass_tls = *

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----