Merge from master into 4.next

[exim.git] / test / confs / 0035

diff --git a/test/confs/0035 b/test/confs/0035
index 36ad12a8319050c4445c67e5a182e965993f927b..8d34269a2f2e67e81ac263b07905937a6abdd8b3 100644 (file)
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -3,14 +3,9 @@
 SERVER=
 SUBMISSION_OPTIONS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----