Gitweb:
https://git.exim.org/exim.git/commitdiff/dab495e070dc243e03e146dc46ddbb3edba4f7ce
Commit: dab495e070dc243e03e146dc46ddbb3edba4f7ce
Parent: d76a9e36a805c5a683b1c5060634ea6bce27da07
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Jun 21 20:39:37 2021 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jun 21 20:39:37 2021 +0100
Testsuite: fix testcases for non-TLS build
---
test/aux-var-src/tls_conf_prefix | 3 ---
test/confs/0900 | 9 ++++++---
test/confs/4525 | 3 ---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
index e3f09b9..226f403 100644
--- a/test/aux-var-src/tls_conf_prefix
+++ b/test/aux-var-src/tls_conf_prefix
@@ -15,9 +15,6 @@ gecos_name = CALLER_NAME
dns_cname_loops = 9
chunking_advertise_hosts =
-.ifdef _HAVE_REQTLS
-tls_advertise_requiretls =
-.endif
.ifdef _HAVE_PIPE_CONNECT
pipelining_connect_advertise_hosts = :
.endif
diff --git a/test/confs/0900 b/test/confs/0900
index a56ec0e..53d06b1 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,9 +13,8 @@ log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
+.ifdef _HAVE_TLS
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
-.ifdef _HAVE_REQTLS
-tls_advertise_requiretls = :
.endif
.ifdef _HAVE_PIPE_CONNECT
pipelining_connect_advertise_hosts = :
@@ -45,7 +44,7 @@ log_selector = +received_recipients +millisec +dkim_verbose
log_selector = +received_recipients +millisec
.endif
-.ifdef _OPT_MAIN_TLS_CERTIFICATE
+.ifdef _HAVE_TLS
tls_certificate = DIR/aux-fixed/cert1
.endif
@@ -110,8 +109,10 @@ remote_smtp:
hosts = 127.0.0.1
port = PORT_S
hosts_try_fastopen = :
+.ifdef _HAVE_TLS
tls_verify_certificates = DIR/aux-fixed/cert1
tls_verify_cert_hostnames =
+.endif
allow_localhost
command_timeout = 2s
final_timeout = 2s
@@ -121,8 +122,10 @@ remote_smtp_dkim:
hosts = 127.0.0.1
port = PORT_S
hosts_try_fastopen = :
+.ifdef _HAVE_TLS
tls_verify_certificates = DIR/aux-fixed/cert1
tls_verify_cert_hostnames =
+.endif
allow_localhost
command_timeout = 2s
final_timeout = 2s
diff --git a/test/confs/4525 b/test/confs/4525
index 040cd11..e254a7b 100644
--- a/test/confs/4525
+++ b/test/confs/4525
@@ -20,9 +20,6 @@ gecos_name = CALLER_NAME
dns_cname_loops = 9
chunking_advertise_hosts = *
-.ifdef _HAVE_REQTLS
-tls_advertise_requiretls =
-.endif
.ifdef _HAVE_PIPE_CONNECT
pipelining_connect_advertise_hosts = :
.endif
