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
Testsuite: avoid using STARTTLS in a non-TLS testcase
[users/heiko/exim.git]
/
test
/
confs
/
2108
diff --git
a/test/confs/2108
b/test/confs/2108
index 0388d0cc685b2095cd9d130ce8260ddd8e1d8e35..5db771d13c861f87fab86801c9767e3013d56812 100644
(file)
--- a/
test/confs/2108
+++ b/
test/confs/2108
@@
-2,14
+2,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- Main settings -----
@@
-27,7
+22,6
@@
tls_advertise_hosts = *
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
# ------ ACL ------
begin acl
# ------ ACL ------
begin acl
@@
-68,6
+62,7
@@
send_to_server1:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :
helo_data = helo.data.changed
send_to_server2:
helo_data = helo.data.changed
send_to_server2:
@@
-75,6
+70,7
@@
send_to_server2:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
# ----- Retry -----
# ----- Retry -----