From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 30 May 2014 11:58:26 +0000 (+0100)
Subject: Fix no-ssl build
X-Git-Tag: exim-4_83_RC2~7
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/32d07012f108f56aaf8f03468fa7ef2e8635325c

Fix no-ssl build
---

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 4db0cbbe5..adb538c59 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3374,12 +3374,12 @@ if (openssl_options != NULL)
       "openssl_options parse error: %s", openssl_options);
 # endif
   }
-#endif
 
 if (gnutls_require_kx || gnutls_require_mac || gnutls_require_proto)
   log_write(0, LOG_MAIN, "WARNING: main options"
       " gnutls_require_kx, gnutls_require_mac and gnutls_require_protocols"
       " are obsolete\n");
+#endif	/*SUPPORT_TLS*/
 }
 
 
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 88f796e33..33c91a67a 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -401,12 +401,14 @@ for them, but do not do any lookups at this time. */
 
 host_build_hostlist(&(ob->fallback_hostlist), ob->fallback_hosts, FALSE);
 
+#ifdef SUPPORT_TLS
 if (  ob->gnutls_require_kx
    || ob->gnutls_require_mac
    || ob->gnutls_require_proto)
   log_write(0, LOG_MAIN, "WARNING: smtp transport options"
     " gnutls_require_kx, gnutls_require_mac and gnutls_require_protocols"
     " are obsolete\n");
+#endif
 }