Merge from master into 4.next

[exim.git] / test / confs / 3404

diff --git a/test/confs/3404 b/test/confs/3404
index dc556e961af7c047586b087d56da95fc84a7a22e..a76581de23b2c528c50b536fdd658e280ff77043 100644 (file)
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -1,13 +1,8 @@
 # Exim test configuration 3404
 
 # Exim test configuration 3404
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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