Don't attempt to use GNUTLS >= 2.6, as it is known broken with the socket-tls backend.

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 2af9192cca3a0cfb83df87eca8078a5b556412e0..4f42efb62cc3721f2f9f2cf40afc933b39a1411d 100644 (file)
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -2,7 +2,7 @@
 # start SMB_EXT_LIB_GNUTLS
 # check for gnutls/gnutls.h and -lgnutls
 
 # start SMB_EXT_LIB_GNUTLS
 # check for gnutls/gnutls.h and -lgnutls
 

-use_gnutls=yes
+use_gnutls=auto

 AC_ARG_ENABLE(gnutls,
 [  --enable-gnutls          Turn on gnutls support (default=yes)],
     [if test x$enable_gnutls = xno; then
 AC_ARG_ENABLE(gnutls,
 [  --enable-gnutls          Turn on gnutls support (default=yes)],
     [if test x$enable_gnutls = xno; then


@@ -10,35 +10,33 @@ AC_ARG_ENABLE(gnutls,
     fi])
 
 
     fi])
 
 

-if test x$use_gnutls = xyes; then
-       SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls, 
-                                                          [SMB_ENABLE_GNUTLS=YES], 
-                                                          [SMB_ENABLE_GNUTLS=NO])
+if test x$use_gnutls = xauto && pkg-config --exists gnutls; then
+       SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls < 2.6.0, 
+                                                          [use_gnutls=yes], 
+                                                          [use_gnutls=no])
+fi

        
        

-       if test x$SMB_ENABLE_GNUTLS = xNO; then
-               AC_CHECK_HEADERS(gnutls/gnutls.h)
-               AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
-               AC_CHECK_DECL(gnutls_x509_crt_set_version,  
-                             [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
-               #include <gnutls/gnutls.h>
-               #include <gnutls/x509.h>
-               ])
-               if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-                       SMB_ENABLE(GNUTLS,YES)
-                       AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
-                                     [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
-               #include <gnutls/gnutls.h>
-               #include <gnutls/x509.h>
-               ])
-               fi
-               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(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
+if test x$use_gnutls = xauto; then
+       AC_CHECK_HEADERS(gnutls/gnutls.h)
+       AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
+       AC_CHECK_DECL(gnutls_x509_crt_set_version,  
+                                 [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
+       #include <gnutls/gnutls.h>
+       #include <gnutls/x509.h>
+       ])
+       if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
+               SMB_ENABLE(GNUTLS,YES)
+               AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
+                                         [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
+       #include <gnutls/gnutls.h>
+       #include <gnutls/x509.h>
+       ])

        fi
        fi

+       SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
+fi
+if test x$use_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(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])

 fi
 fi

-# end SMB_EXT_LIB_GNUTLS
-###############################