Testsuite: expand testcase. Bug 2693

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

diff --git a/test/confs/3461 b/test/confs/3461
index 35c2a17b26ded605a767371af4d0a3b2cee2cfce..159a55376dd0129262923517d4d0b19229568a72 100644 (file)
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -19,11 +19,7 @@ queue_run_in_order
 smtp_accept_max_nonmail = 0
 
 tls_advertise_hosts = *
 smtp_accept_max_nonmail = 0
 
 tls_advertise_hosts = *

-
-# Set certificate only if server
-
-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

 
 
 # ----- Authenticators -----
 
 
 # ----- Authenticators -----


@@ -61,7 +57,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
 


@@ -73,6 +69,7 @@ send_to_server:
   hosts_try_fastopen = :
   hosts_try_auth = *
   hosts_noproxy_tls = PEX
   hosts_try_fastopen = :
   hosts_try_auth = *
   hosts_noproxy_tls = PEX

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

 
 # End
 
 # End