Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 0462

diff --git a/test/confs/0462 b/test/confs/0462
index 31560b90f7f8980ebda464d9027b3866c532ca01..36d18412d0fa357c0d8893756ce301ac830f91c9 100644 (file)
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -1,13 +1,10 @@
 # Exim test configuration 0462
 
 # Exim test configuration 0462
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+SELECTOR=
+
+.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 -----
 


@@ -15,6 +12,7 @@ domainlist local_domains = test.ex
 
 acl_smtp_rcpt = $local_part
 smtp_return_error_details
 
 acl_smtp_rcpt = $local_part
 smtp_return_error_details

+log_selector = SELECTOR

 
 # ----- ACL -----
 
 
 # ----- ACL -----