Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 3500

diff --git a/test/confs/3500 b/test/confs/3500
index fbcd12c9d2d5e8bca7d069b777306ec8fd47f550..2419dece46e6eb6220bc0535c2e59ab7e0f73eef 100644 (file)
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,14 +1,8 @@
 # Exim test configuration 3500
 
 # Exim test configuration 3500
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----
 


@@ -108,7 +102,7 @@ appendfile:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   return_path_add
   user = CALLER
 
   return_path_add
   user = CALLER