Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 3300

diff --git a/test/confs/3300 b/test/confs/3300
index 2dbf0b67fcfbf6f64c497328be5f3b3eedb03109..792ccc5749a0fc9cae5a965b639f883a9f870b19 100644 (file)
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -1,13 +1,8 @@
 # Exim test configuration 3300
 
 # Exim test configuration 3300
 

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