r17674: fixed a problem on with our configure logic on systems that have

libgnutls but not some of the crt functions
(This used to be commit 7a0264c52dd8ab1b1bb321462f66955a866d90a9)

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 33fc2811cae046f269ea6e53e0456006b894a550..00d4194b3a3ac7f69f2c92c5094affef5e5be6dd 100644 (file)
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -25,7 +25,7 @@ if test x$SMB_ENABLE_GNUTLS = xYES; then
        #Some older versions have a different type name
        AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
        AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
-       AC_DEFINE(HAVE_LIBGNUTLS,1,[Whether we have gnutls support (SSL)])
+       AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
 fi
 # end SMB_EXT_LIB_GNUTLS
 ###############################

diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 73b39f8c2a691d514668b17d122973de6e42a466..cd65e22bcbe9bd991fa46a083fa66f5f7b1a2b36 100644 (file)
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -26,7 +26,7 @@
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
 #include "gnutls/gnutls.h"
 
 #define DH_BITS 1024
@@ -48,7 +48,7 @@ struct tls_context {
        struct socket_context *socket;
        struct fd_event *fde;
        BOOL tls_enabled;
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
        gnutls_session session;
        BOOL done_handshake;
        BOOL have_first_byte;
@@ -78,7 +78,7 @@ BOOL tls_enabled(struct socket_context *sock)
 }
 
 
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
 
 static const struct socket_ops tls_socket_ops;
 

diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index 3956475ea08033c75338d317081c400d8a78b53e..89ede7c79aa1a59937e56577d7af1145cbf86984 100644 (file)
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
 #include "gnutls/gnutls.h"
 #include "gnutls/x509.h"