Merge branch 'hs/fix-proxy-bh' (Closes 2656)

[users/heiko/exim.git] / test / confs / 2149

diff --git a/test/confs/2149 b/test/confs/2149
index 072e8e438c5716f57c7cff67c64123078f1b981b..9fa4fbf5a3e1c03f03b0a68d8fa100f8afa3abc9 100644 (file)
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -14,8 +14,7 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
 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_certificate = DIR/aux-fixed/cert1

 tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
 
 
 tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
 
 


@@ -41,7 +40,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
 


@@ -50,6 +49,8 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

-  tls_try_verify_hosts = :
+  hosts_try_fastopen = :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :

 
 # End
 
 # End