Taint enforce: directory open backstops, single-key search filename

[exim.git] / test / confs / 0306

diff --git a/test/confs/0306 b/test/confs/0306
index a6bf031a99e880bba2fa519261ef025b84965aff..779e155fc86e7601d8f5c63ca0dbc68e175626e7 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,12 +1,8 @@
 # Exim test configuration 0306
 
 # Exim test configuration 0306
 

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


@@ -31,14 +27,14 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request

-  file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}

 
 r2:
   driver = redirect
   domains = lists.test.ex
   senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
              {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}
 
 r2:
   driver = redirect
   domains = lists.test.ex
   senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
              {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}

-  file = DIR/aux-fixed/TESTNUM/$local_part
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part}

   forbid_pipe
   forbid_file
   one_time
   forbid_pipe
   forbid_file
   one_time


@@ -68,7 +64,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 t2:
   user = CALLER
 
 t2: