tidying

[users/jgh/exim.git] / test / confs / 0042

diff --git a/test/confs/0042 b/test/confs/0042
index 15e1e67299b6810c570c378b7dc17c0bfe08b480..46229f59fa68e60f861108b58a477a2bd55bf08a 100644 (file)
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,12 +1,7 @@
 # Exim test configuration 0042
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -24,6 +19,11 @@ fail_remote_domains:
   domains = ! +local_domains
   data = :fail: unrouteable mail domain "$domain"
 
+fail_expansion:
+  driver = redirect
+  local_parts = expan
+  data = ${if with syntax error
+
 localuser:
   driver = accept
   local_parts = userx
@@ -38,7 +38,7 @@ local_delivery:
   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