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: mark more command-line arguments
[users/heiko/exim.git]
/
test
/
confs
/
0098
diff --git
a/test/confs/0098
b/test/confs/0098
index 60402deaf362a4a8c18d5f233bcc553dd383bef4..e16b25eaaca3f105723c2c952fa1956fee79bc01 100644
(file)
--- a/
test/confs/0098
+++ b/
test/confs/0098
@@
-2,20
+2,15
@@
WMF=
WMF=
-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 -----
qualify_domain = test.ex
domainlist local_domains = test.ex : another.test.ex
# ----- Main settings -----
qualify_domain = test.ex
domainlist local_domains = test.ex : another.test.ex
+acl_smtp_rcpt = server_acl
delay_warning = 10s:40s:10m
delay_warning = 10s:40s:10m
@@
-30,6
+25,14
@@
queue_run_in_order
WMF
WMF
+# ----- ACL -----
+
+# Only used in server mode
+begin acl
+server_acl:
+ defer message = Over-quota
+
+
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-41,6
+44,12
@@
refused:
self = send
transport = smtp_connect_refused
self = send
transport = smtp_connect_refused
+remote_quota:
+ driver = manualroute
+ route_list = remote.defer 127.0.0.1
+ self = send
+ transport = smtp
+
# The IP address is deliberately V4NET.0.0.1 so as to be unreachable
all:
driver = manualroute
# The IP address is deliberately V4NET.0.0.1 so as to be unreachable
all:
driver = manualroute
@@
-75,17
+84,20
@@
local_delivery:
driver = appendfile
delivery_date_add
envelope_to_add
driver = appendfile
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
return_path_add
user = CALLER
smtp:
driver = smtp
connect_timeout = 1s
return_path_add
user = CALLER
smtp:
driver = smtp
connect_timeout = 1s
+ port = PORT_D
+ hosts_try_fastopen = :
smtp_connect_refused:
driver = smtp
port = PORT_N
smtp_connect_refused:
driver = smtp
port = PORT_N
+ hosts_try_fastopen = :
# ----- Retry -----
# ----- Retry -----