Replace recv() by read() (Bug 2656)

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

diff --git a/test/confs/2117 b/test/confs/2117
index 8bf80f2b88d5eea1d100f2a110b82c77cda50c39..16429f1a45c667a7218889364f5aa293dc264dc4 100644 (file)
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -2,13 +2,9 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -20,11 +16,7 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
 queue_run_in_order
 
 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 -----


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


@@ -57,9 +49,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_nopass_tls = *

   port = PORT_D
   port = PORT_D

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

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----