Merge from master into 4.next

[exim.git] / test / confs / 3454

diff --git a/test/confs/3454 b/test/confs/3454
index 727a71d8698cc84f6ad3aea9e88545093472b820..4561c58f7d4512778c5351cd8669bb9030c1fab5 100644 (file)
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -1,12 +1,8 @@
 # Exim test configuration 3454
 
 # Exim test configuration 3454
 

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

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