Merge branch 'master' into 4.next

[exim.git] / test / confs / 0420

diff --git a/test/confs/0420 b/test/confs/0420
index 0ac496fd55f080a290017e213421dccf894c1c6c..734b1237edf1d375d618f2f140655b5e791c38c4 100644 (file)
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,19 +1,16 @@
 # Exim test configuration 0420
 
 # Exim test configuration 0420
 

-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 -----
 
 primary_hostname = mail.test.ex
 qualify_domain = test.ex
 
 
 # ----- Main settings -----
 
 primary_hostname = mail.test.ex
 qualify_domain = test.ex
 

+queue_only

 acl_smtp_rcpt = accept
 acl_smtp_rcpt = accept

+acl_smtp_data =        accept logwrite = ${quote:h: <$h_Received:>}

 
 received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}
 
 
 received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}