Merge branch 'master' into 4.next

[exim.git] / test / confs / 0295

diff --git a/test/confs/0295 b/test/confs/0295
index 04e5b36a80c3c778a86e51c793b77d26859a4960..997b83c6b773302fcc7a58be3e17de681ea91e5e 100644 (file)
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -1,15 +1,9 @@
 # Exim test configuration 0295
 
 # Exim test configuration 0295
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-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 =
+.include DIR/aux-var/std_conf_prefix
+

 trusted_users = CALLER
 trusted_users = CALLER

+primary_hostname = myhost.test.ex

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----