DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4221

diff --git a/test/confs/4221 b/test/confs/4221
index 61205cde3e8e6f0f3a27c375fc671c8e61751feb..d146ecfdfa598e84b4e8170e25f4ea35030fab02 100644 (file)
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -21,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
 
@@ -107,7 +106,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
@@ -117,7 +117,8 @@ rmt_smtp:
   driver =     smtp
   hosts_try_fastopen = :
   hosts_require_tls =  *
-  tls_try_verify_hosts = :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :
   utf8_downconvert =   0
 
 # End