Merge branch 'exim-4.96+security'

[exim.git] / test / confs / 0420

diff --git a/test/confs/0420 b/test/confs/0420
index 204e86e3c3d398b3f487624a2af6a8a7eee332b1..734b1237edf1d375d618f2f140655b5e791c38c4 100644 (file)
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,13 +1,7 @@
 # Exim test configuration 0420
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -16,7 +10,7 @@ qualify_domain = test.ex
 
 queue_only
 acl_smtp_rcpt = accept
-acl_smtp_data =        accept logwrite = h: <$h_Received:>
+acl_smtp_data =        accept logwrite = ${quote:h: <$h_Received:>}
 
 received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}