Merge from master into 4.next

[exim.git] / test / confs / 0260

diff --git a/test/confs/0260 b/test/confs/0260
index 442ab2880ec589de1746cb4b2ddaec91e1dfd3e8..6366cd0ad452c289e16f445551f920aaa9ac2433 100644 (file)
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,13 +1,8 @@
 # Exim test configuration 0260
 
-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 -----