git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Taint: fix ACL "spam" condition, to permit tainted name arguments
[users/jgh/exim.git]
/
test
/
confs
/
0420
diff --git
a/test/confs/0420
b/test/confs/0420
index 38cf50c2267a972cf325b720d6d67265d78e0cfc..a115c7249883f19ce1aa11157b80e1d3277cb4f1 100644
(file)
--- a/
test/confs/0420
+++ b/
test/confs/0420
@@
-1,19
+1,16
@@
# Exim test configuration 0420
# Exim test configuration 0420
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
primary_hostname = mail.test.ex
qualify_domain = test.ex
# ----- Main settings -----
primary_hostname = mail.test.ex
qualify_domain = test.ex
+queue_only
acl_smtp_rcpt = accept
acl_smtp_rcpt = accept
+acl_smtp_data = accept logwrite = h: <$h_Received:>
received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}
received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}