Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / confs / 3400

diff --git a/test/confs/3400 b/test/confs/3400
index 8496e435b9c6e687dbefc6bd07fc61c9b1a285e8..d94e70d7c2ee21911485b0462214ea2763cc9c33 100644 (file)
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,14 +1,8 @@
 # Exim test configuration 3400
 
 # Exim test configuration 3400
 

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


@@ -157,7 +151,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