X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..5ce86c4f552071ad7408c40324d5211ab2a2da82:/test/confs/4221

diff --git a/test/confs/4221 b/test/confs/4221
index a5cc47ad1..07feb488b 100644
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -4,13 +4,7 @@
 OPTION = *
 CONTROL =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
 # ----- Main settings -----
 
@@ -27,9 +21,8 @@ queue_only
 queue_run_in_order
 .endif
 
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey =  ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_advertise_hosts = *
+tls_certificate = DIR/aux-fixed/cert1
 
 smtputf8_advertise_hosts = OPTION
 
@@ -113,15 +106,18 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   return_path_add
 
 rmt_smtp:
-  driver = smtp
-  hosts_require_tls = *
-  tls_try_verify_hosts = :
+  driver =	smtp
+  hosts_try_fastopen =	:
+  hosts_require_tls =	*
+  tls_verify_certificates =	DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =	:
+  utf8_downconvert =	0
 
 # End