Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 0374

diff --git a/test/confs/0374 b/test/confs/0374
index 87b3e182dad711d4112e46ebc7e132e483e5d5a6..1cae0254ce256be98279b2901e5a7521695d584d 100644 (file)
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,13 +1,8 @@
 # Exim test configuration 0374
 
 # Exim test configuration 0374
 

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

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

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

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


@@ -55,7 +50,7 @@ begin transports
 # Successful local transport
 ut1:
   driver = appendfile
 # Successful local transport
 ut1:
   driver = appendfile

-  file = DIR/test-mail/$local_part-u
+  file = DIR/test-mail/${bless:$local_part}-u

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add


@@ -80,6 +75,7 @@ ut3:
 ut4:
   driver = smtp
   hosts = 127.0.0.1
 ut4:
   driver = smtp
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   port = PORT_S
   allow_localhost
   max_rcpt = 1
   port = PORT_S
   allow_localhost
   max_rcpt = 1


@@ -87,7 +83,7 @@ ut4:
 # Real delivery
 real:
   driver = appendfile
 # Real delivery
 real:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add