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

[abartlet at samba.org]

Author: abartlet
Date: 2006-08-04 23:46:03 +0000 (Fri, 04 Aug 2006)
New Revision: 17411

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

Log:
Try and compile on older versions of GnuTLS.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tls/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/config.m4	2006-08-04 23:30:10 UTC (rev 17410)
+++ branches/SAMBA_4_0/source/lib/tls/config.m4	2006-08-04 23:46:03 UTC (rev 17411)
@@ -17,6 +17,9 @@
 	SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
 fi
 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)])
 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-04 23:30:10 UTC (rev 17410)
+++ branches/SAMBA_4_0/source/lib/tls/tls.c	2006-08-04 23:46:03 UTC (rev 17411)
@@ -31,6 +31,10 @@
 
 #define DH_BITS 1024
 
+#if defined(HAVE_GNUTLS_DATUM) && !defined(HAVE_GNUTLS_DATUM_T)
+typedef gnutls_datum gnutls_datum_t
+#endif
+
 /* hold persistent tls data */
 struct tls_params {
 	gnutls_certificate_credentials x509_cred;