Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 3461

diff --git a/test/confs/3461 b/test/confs/3461
index c93abddd76654681a3005cd8012d397bb84f0213..f865057fd79de210ae18a5b8ca46b436cdd64969 100644 (file)
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -1,14 +1,11 @@
 # Exim test configuration 3461
 
 SERVER =
 # Exim test configuration 3461
 
 SERVER =

+PEX = :
+
+.include DIR/aux-var/tls_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 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 -----
 


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


@@ -72,8 +69,10 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_try_auth = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_try_auth = *
+  hosts_noproxy_tls = PEX

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End