Merge branch 'master' into 4.next

[exim.git] / test / confs / 0260

diff --git a/test/confs/0260 b/test/confs/0260
index b0c549d46b0a9331452f900ba90576ff8034608a..6366cd0ad452c289e16f445551f920aaa9ac2433 100644 (file)
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,14 +1,8 @@
 # Exim test configuration 0260
 
 # Exim test configuration 0260
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

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