Testsuite: fix testcases for non-TLS build

diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
index e3f09b98b6ae83cffa0ea13fe6d7601e97a66e6e..226f403071a281231ad2c6aa3124fb7c190f3597 100644 (file)
--- 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 a56ec0e5cb0a5a1e5d4e995f4bf21418feb9e674..53d06b149231b8cdc5b9922be5c9801d587c9691 100644 (file)
--- 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 040cd117c7bc6e006076f2812e134c7ce3f2ca19..e254a7b352a943b33c879871b6de836178cb713e 100644 (file)
--- 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