Taint: fix ACL "spam" condition, to permit tainted name arguments.

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

diff --git a/test/confs/0547 b/test/confs/0547
index e8e8eedd482aa0988d93795e8e3cd21722ccd4ad..f3442b25b591cdba6baaca9783d48073790c2aaa 100644 (file)
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -1,21 +1,17 @@
 # Exim test configuration 0547
 
 MAXNM = 100
+LOG_SELECTOR =
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
-log_selector = +smtp_no_mail
+log_selector = +smtp_no_mail LOG_SELECTOR
 
 smtp_accept_max_nonmail = MAXNM