Merge from master into 4.next

[exim.git] / test / confs / 0033

diff --git a/test/confs/0033 b/test/confs/0033
index 9e95388c3b0fa384e279eb1f4290d5d2593c3ad2..ca06da772d831cabea2daa4d6c6fae855f7868fe 100644 (file)
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,13 +1,8 @@
 # Exim test configuration 0033
 
 # Exim test configuration 0033
 

-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 -----