Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 0380

diff --git a/test/confs/0380 b/test/confs/0380
index 8403ccb5c77e24b07fe4c67206f0f52c67f6ac95..0bad1f7c2203b91b8eded20046d1226b8b13a7ba 100644 (file)
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,12 +1,8 @@
 # Exim test configuration 0380
 
 # Exim test configuration 0380
 

-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

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


@@ -29,13 +25,13 @@ r0:
 r1:
   driver = redirect
   local_parts = aaaa
 r1:
   driver = redirect
   local_parts = aaaa

-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/${bless:$local_part}

 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir
 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir

-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/${bless:$local_part}

 
 r3:
   driver = accept
 
 r3:
   driver = accept


@@ -47,7 +43,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 
   user = CALLER