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
Testsuite: output changes resulting
[exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index 53d06b149231b8cdc5b9922be5c9801d587c9691..80c0211a936743bd1e85005703aa6a5f8c07b365 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-32,16
+32,18
@@
primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
+.ifdef _HAVE_PRDR
acl_smtp_data_prdr = check_prdr
acl_smtp_data_prdr = check_prdr
+.endif
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
.ifdef _HAVE_DKIM
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
.ifdef _HAVE_DKIM
-log_selector = +received_recipients +millisec +dkim_verbose
+log_selector = +received_recipients +
connection_id +
millisec +dkim_verbose
.else
.else
-log_selector = +received_recipients +millisec
+log_selector = +received_recipients +
connection_id +
millisec
.endif
.ifdef _HAVE_TLS
.endif
.ifdef _HAVE_TLS
@@
-55,6
+57,10
@@
ALLOW
begin acl
check_recipient:
begin acl
check_recipient:
+.ifdef RETRY2
+ drop condition = ${if eq {SERVER}{server}}
+ message = 550 we really do not like you
+.endif
accept hosts = :
accept domains = +local_domains
deny message = relay not permitted
accept hosts = :
accept domains = +local_domains
deny message = relay not permitted
@@
-106,7
+112,11
@@
local_delivery:
remote_smtp:
driver = smtp
remote_smtp:
driver = smtp
+.ifdef RETRY2
+ hosts = 127.0.0.1 : HOSTIPV4
+.else
hosts = 127.0.0.1
hosts = 127.0.0.1
+.endif
port = PORT_S
hosts_try_fastopen = :
.ifdef _HAVE_TLS
port = PORT_S
hosts_try_fastopen = :
.ifdef _HAVE_TLS