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
Docs: fix description of hosts_try_dane. Bug 2704
[users/heiko/exim.git]
/
test
/
confs
/
3401
diff --git
a/test/confs/3401
b/test/confs/3401
index 6406e3178c107ddb23d4f256e7b229c1af395e7f..401d5cfa5818702bdbe25fb76020c2d27aafe05f 100644
(file)
--- a/
test/confs/3401
+++ b/
test/confs/3401
@@
-1,13
+1,9
@@
# Exim test configuration 3401
# Exim test configuration 3401
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +smtp_mailauth
primary_hostname = myhost.test.ex
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
# ----- Main settings -----
# ----- Main settings -----
@@
-22,6
+18,7
@@
login:
driver = plaintext
public_name = LOGIN
client_send = : userx : secret
driver = plaintext
public_name = LOGIN
client_send = : userx : secret
+ client_set_id = userx
plain:
driver = plaintext
plain:
driver = plaintext
@@
-32,6
+29,7
@@
xlogin:
driver = plaintext
public_name = XLOGIN
client_send = : $auth1 : $auth1+$auth2
driver = plaintext
public_name = XLOGIN
client_send = : $auth1 : $auth1+$auth2
+ client_set_id = $auth1
# ----- Routers -----
# ----- Routers -----
@@
-57,14
+55,16
@@
begin transports
smtp_try:
driver = smtp
smtp_try:
driver = smtp
- hosts_try_auth = *
port = PORT_S
port = PORT_S
+ hosts_try_fastopen = :
+ hosts_try_auth = *
authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
smtp_force:
driver = smtp
authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
smtp_force:
driver = smtp
- hosts_require_auth = *
port = PORT_S
port = PORT_S
+ hosts_try_fastopen = :
+ hosts_require_auth = *
# ----- Retry -----
# ----- Retry -----