Merge branch 'master' into 4.next

[exim.git] / test / confs / 0294

diff --git a/test/confs/0294 b/test/confs/0294
index 6b8a6112ea58c7e7a76c05060b1d2b6607f07eff..6e17b832db637038e590990fc9c582947ed9f1d1 100644 (file)
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,14 +1,9 @@
 # Exim test configuration 0294
 
 # Exim test configuration 0294
 

-exim_path = EXIM_PATH
-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 -----