From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 24 May 2019 15:09:13 +0000 (+0100)
Subject: DANE: remove excess compile-time checks
X-Git-Tag: exim-4.93-RC0~182
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=21ee816d09865a5c5d85f86ae4d12b9995030806;p=exim.git

DANE: remove excess compile-time checks
---

diff --git a/src/src/structs.h b/src/src/structs.h
index da61df24f..9fade0091 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -805,7 +805,7 @@ typedef struct {
   int                   host_af;
   uschar *              interface;
 
-#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
+#ifdef SUPPORT_DANE
   BOOL dane:1;			/* connection must do dane */
   dns_answer		tlsa_dnsa;
 #endif
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 42517400b..03095b7c7 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -134,7 +134,7 @@ optionlist smtp_transport_options[] = {
       (void *)offsetof(smtp_transport_options_block, hosts_try_auth) },
   { "hosts_try_chunking",   opt_stringptr,
       (void *)offsetof(smtp_transport_options_block, hosts_try_chunking) },
-#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
+#ifdef SUPPORT_DANE
   { "hosts_try_dane",       opt_stringptr,
       (void *)offsetof(smtp_transport_options_block, hosts_try_dane) },
 #endif
@@ -1972,7 +1972,7 @@ sx->esmtp_sent = FALSE;
 sx->utf8_needed = FALSE;
 #endif
 sx->dsn_all_lasthop = TRUE;
-#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
+#ifdef SUPPORT_DANE
 sx->conn_args.dane = FALSE;
 sx->dane_required =
   verify_check_given_host(CUSS &ob->hosts_require_dane, sx->conn_args.host) == OK;
@@ -2056,7 +2056,7 @@ if (!continue_hostname)
 
   smtp_port_for_connect(sx->conn_args.host, sx->port);
 
-#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
+#ifdef SUPPORT_DANE
     /* Do TLSA lookup for DANE */
     {
     tls_out.dane_verified = FALSE;