Merge from master into 4.next

[exim.git] / test / confs / 0556

diff --git a/test/confs/0556 b/test/confs/0556
index 81fc19593b26794438558a2a3a9221d4aa93d688..965d68120ab8826d1984cb0c88711a2cef087138 100644 (file)
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -5,14 +5,9 @@ ACL_RCPT=accept
 ACL_PREDATA=accept
 PAH=127.0.0.1
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----