svn commit: samba r17674 - in branches/SAMBA_4_0/source/lib/tls: .

[tridge at samba.org]

Author: tridge
Date: 2006-08-21 23:00:53 +0000 (Mon, 21 Aug 2006)
New Revision: 17674

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17674

Log:

fixed a problem on with our configure logic on systems that have
libgnutls but not some of the crt functions

Modified:
   branches/SAMBA_4_0/source/lib/tls/config.m4
   branches/SAMBA_4_0/source/lib/tls/tls.c
   branches/SAMBA_4_0/source/lib/tls/tlscert.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tls/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/config.m4	2006-08-21 21:53:02 UTC (rev 17673)
+++ branches/SAMBA_4_0/source/lib/tls/config.m4	2006-08-21 23:00:53 UTC (rev 17674)
@@ -25,7 +25,7 @@
 	#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
 ###############################

Modified: branches/SAMBA_4_0/source/lib/tls/tls.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/tls.c	2006-08-21 21:53:02 UTC (rev 17673)
+++ branches/SAMBA_4_0/source/lib/tls/tls.c	2006-08-21 23:00:53 UTC (rev 17674)
@@ -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 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 @@
 }
 
 
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
 
 static const struct socket_ops tls_socket_ops;
 

Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/tlscert.c	2006-08-21 21:53:02 UTC (rev 17673)
+++ branches/SAMBA_4_0/source/lib/tls/tlscert.c	2006-08-21 23:00:53 UTC (rev 17674)
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#if HAVE_LIBGNUTLS
+#if ENABLE_GNUTLS
 #include "gnutls/gnutls.h"
 #include "gnutls/x509.h"