X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..618f89bfd392ed2094889bb5d4c6d734bcc72b03:/test/confs/0046

diff --git a/test/confs/0046 b/test/confs/0046
index 554366907..15e8df80f 100644
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -1,15 +1,13 @@
 # Exim test configuration 0046
 
-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
+NL=FALSE
+
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
+message_body_newlines = NL
 message_id_header_domain = test.ex
 qualify_domain = test.ex
 # Omit Received: so as to keep the header size fixed
@@ -21,12 +19,6 @@ trusted_users = CALLER
 
 begin routers
 
-forwardfile:
-  driver = redirect
-  allow_filter
-  check_local_user
-  file = DIR/aux-fixed/TESTNUM.filter.$local_part
-
 localuser:
   driver = accept
   local_parts = userx
@@ -40,7 +32,7 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-size: $message_size\n\
                  X-body-size: $message_body_size\n\
                  X-body: $message_body\n\