git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix taint-checking on FreeBSD
[users/heiko/exim.git]
/
test
/
confs
/
0481
diff --git
a/test/confs/0481
b/test/confs/0481
index be3f923ddd7d616e61deeba129a5d4c0af2fc001..ae1b788194c417263c456c0b15746b41bed5ef0a 100644
(file)
--- a/
test/confs/0481
+++ b/
test/confs/0481
@@
-1,13
+1,8
@@
# Exim test configuration 0481
# Exim test configuration 0481
-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 -----
@@
-23,13
+18,16
@@
r1:
r2:
driver = redirect
r2:
driver = redirect
+ headers_remove = Remove-Me-Also:
headers_remove = Remove-Me:
headers_remove = Remove-Me:
+ headers_remove = <; Remove-Me-Too ; Remove-Me-Too2
data = $local_part@domain
r3:
driver = accept
headers_remove = Remove-Me:
headers_add = X-Was-Remove-Me: >$h_remove-me:<
data = $local_part@domain
r3:
driver = accept
headers_remove = Remove-Me:
headers_add = X-Was-Remove-Me: >$h_remove-me:<
+ headers_add = ${if def:h_remove-me-also {X-Was-Remove-Me-Also: >$h_remove-me-also:<}}
transport = t1
transport = t1