Merge branch 'master' into 4.next

[exim.git] / test / confs / 0070

diff --git a/test/confs/0070 b/test/confs/0070
index 77ec017ece0c7f95b9fadd90c653c6e01a067e5c..81c28811f9ce3412c9de738d4bc6b5b8062a853e 100644 (file)
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -2,18 +2,14 @@
 
 HVH=
 
 
 HVH=
 

-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 -----
 
 acl_smtp_rcpt = rcpt
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = rcpt

+hosts_require_helo =

 helo_verify_hosts = ten-1.test.ex : ten-3.test.ex : HVH
 helo_try_verify_hosts = ten-2.test.ex
 log_selector = -host_lookup_failed
 helo_verify_hosts = ten-1.test.ex : ten-3.test.ex : HVH
 helo_try_verify_hosts = ten-2.test.ex
 log_selector = -host_lookup_failed