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
Taint: fix ACL "spam" condition, to permit tainted name arguments.
[users/heiko/exim.git]
/
test
/
confs
/
0099
diff --git
a/test/confs/0099
b/test/confs/0099
index 122856ce7a9d6de1e2a5e62da3f234fe0caaa16a..6a59d5994dc6653b988a1c88d96d01e8b39a89bb 100644
(file)
--- a/
test/confs/0099
+++ b/
test/confs/0099
@@
-2,14
+2,8
@@
RETRY =
RETRY =
-exim_path = EXIM_PATH
-keep_environment =
-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 -----
# ----- Main settings -----
@@
-25,7
+19,7
@@
begin routers
bydns:
driver = dnslookup
bydns:
driver = dnslookup
- domains = mxt2.test.ex
+ domains = mxt2.test.ex
: mxnonexist.test.ex
transport = smtp
fail_defer_domains = *
transport = smtp
fail_defer_domains = *
@@
-46,7
+40,8
@@
begin transports
smtp:
driver = smtp
smtp:
driver = smtp
- port = 999
+ port = PORT_N
+ hosts_try_fastopen = :
RETRY
RETRY
@@
-70,7
+65,7
@@
rcpt4xx.test.ex rcpt_4xx F,10d,1m
*@@ * F,5d,6m
lsearch*@;DIR/aux-fixed/TESTNUM.rlist * F,1d,3m
*.star.ex * F,3d,10m
*@@ * F,5d,6m
lsearch*@;DIR/aux-fixed/TESTNUM.rlist * F,1d,3m
*.star.ex * F,3d,10m
-!*.not.ex * F,2d,
15
m
+!*.not.ex * F,2d,
20
m
* * F,12d,150m
# End
* * F,12d,150m
# End