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
Merge branch 'master' into 4.next
[users/jgh/exim.git]
/
test
/
confs
/
0497
diff --git
a/test/confs/0497
b/test/confs/0497
index 4777bd20de63aff13f801a58356ba6e0c4111017..af8fc81dd9d72e3e420f0722a620ce736960b86b 100644
(file)
--- a/
test/confs/0497
+++ b/
test/confs/0497
@@
-3,11
+3,11
@@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
exim_path = EXIM_PATH
host_lookup_order = bydns
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
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-17,6
+17,11
@@
gecos_name = CALLER_NAME
begin routers
begin routers
+r0:
+ driver = redirect
+ senders = :
+ data = :blackhole: discard bounces
+
r1:
driver = accept
transport = t1
r1:
driver = accept
transport = t1
@@
-37,7
+42,10
@@
t1:
begin retry
begin retry
+* lost_connection
+* mail_4xx
* rcpt_4xx
* rcpt_4xx
+* data_4xx
* * F,1d,15m
* * F,1d,15m