[exim-cvs] Fix no-ssl build

Gitweb: http://git.exim.org/exim.git/commitdiff/32d07012f108f56aaf8f03468fa7ef2e8635325c

Commit:     32d07012f108f56aaf8f03468fa7ef2e8635325c
Parent:     00bff6f61e05faee0a5a76d3b882f6d1dd96537c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri May 30 12:58:26 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri May 30 12:58:26 2014 +0100

    Fix no-ssl build
---
 src/src/readconf.c        |    2 +-
 src/src/transports/smtp.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 4db0cbb..adb538c 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 88f796e..33c91a6 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
 }