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
Typo in sample configuration
[users/heiko/exim.git]
/
test
/
confs
/
3465
diff --git
a/test/confs/3465
b/test/confs/3465
index adadeb0591f66b0a99cecca66147f5b435dfa811..dfe6b9921360700977e6ffa2c7b6acb0e0eae8b0 100644
(file)
--- a/
test/confs/3465
+++ b/
test/confs/3465
@@
-2,14
+2,9
@@
HOSTS_AVOID_TLS=
HOSTS_AVOID_TLS=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
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 -----
@@
-36,7
+31,7
@@
plain:
server_condition = "\
${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}"
server_set_id = $2
server_condition = "\
${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}"
server_set_id = $2
- client_condition = ${if !eq {$tls_cipher}{}}
+ client_condition = ${if !eq {$tls_
out_
cipher}{}}
client_send = ^userx^secret1
login:
client_send = ^userx^secret1
login:
@@
-67,8
+62,13
@@
t1:
hosts = 127.0.0.1
port = PORT_D
hosts_avoid_tls = HOSTS_AVOID_TLS
hosts = 127.0.0.1
port = PORT_D
hosts_avoid_tls = HOSTS_AVOID_TLS
+ tls_try_verify_hosts = :
hosts_require_auth = *
allow_localhost
hosts_require_auth = *
allow_localhost
+ # These can be made visible by adding "-d-all+deliver+transport+tls" to the script 1st queuerun
+ headers_add = X-tls-cipher: <$tls_cipher>
+ headers_add = X-tls-out-cipher: <$tls_out_cipher>
+
# End
# End