git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMARC: expand main-config options. Bug 3102
[exim.git]
/
test
/
confs
/
0256
diff --git
a/test/confs/0256
b/test/confs/0256
index 669fdb114bcbd938af804ab6172c0c87ca3e2c1e..0a54675393780444a62eead575f7a7fe9838dd29 100644
(file)
--- a/
test/confs/0256
+++ b/
test/confs/0256
@@
-1,18
+1,16
@@
# Exim test configuration 0256
# Exim test configuration 0256
-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 -----
+acl_smtp_rcpt = accept
qualify_domain = test.ex
qualify_domain = test.ex
-errors_copy = *@* abcd@test.ex
+errors_copy = *@* ${quote_local_part::abcd+$domain+\
+ ${if eq{$local_part}{CALLER}{xxxx}{$local_part}}}@test.ex
+trusted_users = CALLER
# ------ Routers ------
# ------ Routers ------
@@
-33,6
+31,7
@@
begin transports
t1:
driver = appendfile
file = DIR/test-mail/$local_part
t1:
driver = appendfile
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
user = CALLER
# End
user = CALLER
# End