Use ALARM() to set deadline on reading the proxy header (Bug 2656)

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

diff --git a/test/confs/2113 b/test/confs/2113
index eb9d2b487fb2f1b26676c96d33d815d8527031c3..b992747e25efa42dad05c3cd895074601d2ce757 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -20,10 +20,7 @@ smtp_accept_max_nonmail = 0
 
 tls_advertise_hosts = *
 
 
 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

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


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


@@ -69,6 +66,7 @@ send_to_server:
   port = PORT_D
   hosts_try_fastopen = :
   hosts_noproxy_tls = PEX
   port = PORT_D
   hosts_try_fastopen = :
   hosts_noproxy_tls = PEX

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

 
 # End
 
 # End