SRS: avoid expanding ${srs_encode...} when guarded by ${if...}

[exim.git] / test / confs / 2149

diff --git a/test/confs/2149 b/test/confs/2149
index 41e71486f9605b7f88186c898e6a580db6fb32e2..d70cd5c63f9909e1ebf3e267e0fb73d1c8be01ff 100644 (file)
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -10,13 +10,9 @@ primary_hostname = myhost.test.ex
 
 acl_smtp_rcpt = accept
 
-queue_only
-queue_run_in_order
-
 tls_advertise_hosts = *
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
+tls_certificate = DIR/aux-fixed/cert1
+tls_dhparam = ${if eq {SERVER}{server}{DATA}fail}
 
 
 # ----- Routers -----
@@ -41,7 +37,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
@@ -51,6 +48,7 @@ send_to_server:
   hosts = 127.0.0.1
   port = PORT_D
   hosts_try_fastopen = :
-  tls_try_verify_hosts = :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :
 
 # End