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
Docs: more info for dovecot auth driver
[users/jgh/exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index 9a856899aa62e0023e7950e6e24d68f730dfe7de..4c824c4b41ecabf68a6614a4a777fa69afe6f1e5 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-13,6
+13,15
@@
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
# ----- Main settings -----
# ----- Main settings -----
@@
-64,7
+73,7
@@
begin routers
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
- transport = remote_smtp${if eq {
OPT
}{dkim} {_dkim}}
+ transport = remote_smtp${if eq {
SRV
}{dkim} {_dkim}}
errors_to = ""
fail_remote_domains:
errors_to = ""
fail_remote_domains:
@@
-97,6
+106,7
@@
remote_smtp:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
@@
-105,11
+115,13
@@
remote_smtp_dkim:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
-.ifdef OPT
+.ifdef _HAVE_DKIM
+.ifdef SRV
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
@@
-117,6
+129,7
@@
remote_smtp_dkim:
dkim_sign_headers = LIST
.endif
.endif
dkim_sign_headers = LIST
.endif
.endif
+.endif
# ----- Retry -----
# ----- Retry -----