X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/e8793bad207763b266bedcb9d859e238b6a3a04e..32ef25152ecda2555eabe22a0c37ec398068dbba:/test/confs/0600

diff --git a/test/confs/0600 b/test/confs/0600
index 0347e4c60..58257e55e 100644
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -1,12 +1,8 @@
-# Exim test configuration 0005
+# Exim test configuration 0600
+# utf8clean:string
+
+.include DIR/aux-var/std_conf_prefix
 
-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
 
 # ----- Main settings -----
 
@@ -24,15 +20,17 @@ begin acl
 
 check_data:
   accept logwrite = \
-  			x-test-header-good1: ${utf8clean:$h_x-test-header-good1:}
- 		 logwrite = \
-  			x-test-header-good2: ${utf8clean:$h_x-test-header-good2:}
- 		 logwrite = \
-  			x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:}
- 		 logwrite = \
-  			x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:}
- 		 logwrite = \
-  			x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:}
+			x-test-header-good1: ${utf8clean:$h_x-test-header-good1:}
+		 logwrite = \
+			x-test-header-good2: ${utf8clean:$h_x-test-header-good2:}
+		 logwrite = \
+			x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:}
+		 logwrite = \
+			x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:}
+		 logwrite = \
+			x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:}
+		 logwrite = \
+			x-test-header-truncated: ${utf8clean:$h_x-test-header-truncated:}
 
 
 
@@ -60,7 +58,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"