[exim-cvs] Unbreak no-TLS build

Gitweb: https://git.exim.org/exim.git/commitdiff/6fa5cd352fc9c1e86ec56ac4f2b96804b6472a5f

Commit:     6fa5cd352fc9c1e86ec56ac4f2b96804b6472a5f
Parent:     c1d124daf6ccb5b2ec59cf7fa6c1d76002ab0a42
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Jun 3 16:20:20 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jun 3 16:20:20 2024 +0100

    Unbreak no-TLS build

    Broken-by: 4243a209fd94
---
 src/src/smtp_in.c         | 5 ++++-
 src/src/transports/smtp.c | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index c941d115c..5110ed3d6 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2067,9 +2067,12 @@ log_connect_tls_drop(const uschar * what, const uschar * log_msg)
 {
 if (log_reject_target)
   {
+#ifdef DISABLE_TLS
+  uschar * tls = NULL;
+#else
   gstring * g = s_tlslog(NULL);
   uschar * tls = string_from_gstring(g);
-
+#endif
   log_write(L_connection_reject,
     log_reject_target, "%s%s%s dropped by %s%s%s",
     LOGGING(dnssec) && sender_host_dnssec ? US" DS" : US"",
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 0338d6301..8645c150d 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1091,7 +1091,7 @@ if (pending_BANNER)
     }
   /*XXX EXPERIMENTAL_ESMTP_LIMITS ? */

-# ifndef DISABLE_TLS_RESUME
+# if !defined(DISABLE_TLS) && !defined(DISABLE_TLS_RESUME)
   GET_OPTION("host_name_extract");
   s = ((smtp_transport_options_block *)sx->conn_args.ob)->host_name_extract;
   if (!s) s = HNE_DEFAULT;
@@ -2635,7 +2635,7 @@ goto SEND_QUIT;
       }
     }
 #endif
-#ifndef DISABLE_TLS_RESUME
+#if !defined(DISABLE_TLS) && !defined(DISABLE_TLS_RESUME)
       GET_OPTION("host_name_extract");
       if (!(s = ob->host_name_extract)) s = HNE_DEFAULT;
       ehlo_response_lbserver(sx, s);

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/