|
 |
1a0d93 |
diff --git a/configure.ac b/configure.ac
|
|
|
1a0d93 |
index 3b5836ff..daeee728 100644
|
|
|
1a0d93 |
--- a/configure.ac
|
|
|
1a0d93 |
+++ b/configure.ac
|
|
|
1a0d93 |
@@ -546,6 +546,11 @@ if test "x$enable_samba" != "xno"; then
|
|
|
1a0d93 |
if test "x$msg_samba" = "xyes"; then
|
|
|
1a0d93 |
PKG_CHECK_MODULES([SAMBA], [smbclient])
|
|
|
1a0d93 |
AC_DEFINE([HAVE_SAMBA], 1, [Define to 1 if you have the samba libraries])
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ AC_CHECK_LIB(smbclient, smbc_setOptionProtocols,
|
|
|
1a0d93 |
+ AC_DEFINE(HAVE_SMBC_SETOPTIONPROTOCOLS, 1, [Define to 1 if smbc_setOptionProtocols() is available]),
|
|
|
1a0d93 |
+ []
|
|
|
1a0d93 |
+ )
|
|
|
1a0d93 |
fi
|
|
|
1a0d93 |
fi
|
|
|
1a0d93 |
|
|
|
1a0d93 |
diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
|
|
|
1a0d93 |
index f08d2988..3b11883e 100644
|
|
|
1a0d93 |
--- a/daemon/gvfsbackendsmbbrowse.c
|
|
|
1a0d93 |
+++ b/daemon/gvfsbackendsmbbrowse.c
|
|
|
1a0d93 |
@@ -45,6 +45,7 @@
|
|
|
1a0d93 |
#include "gvfskeyring.h"
|
|
|
1a0d93 |
#include "gmounttracker.h"
|
|
|
1a0d93 |
#include "gvfsbackendsmbprivate.h"
|
|
|
1a0d93 |
+#include "gvfsutils.h"
|
|
|
1a0d93 |
|
|
|
1a0d93 |
#include <libsmbclient.h>
|
|
|
1a0d93 |
|
|
|
1a0d93 |
@@ -847,6 +848,47 @@ do_mount (GVfsBackend *backend,
|
|
|
1a0d93 |
else
|
|
|
1a0d93 |
op_backend->server = g_strdup (op_backend->mounted_server);
|
|
|
1a0d93 |
|
|
|
1a0d93 |
+#ifdef HAVE_SMBC_SETOPTIONPROTOCOLS
|
|
|
1a0d93 |
+ /* Force NT1 protocol version if server can't be resolved (i.e. is not
|
|
|
1a0d93 |
+ * hostname, nor IP address). This is needed for workgroup support, because
|
|
|
1a0d93 |
+ * "client max protocol" has been changed from NT1 to SMB3 in recent samba
|
|
|
1a0d93 |
+ * versions.
|
|
|
1a0d93 |
+ */
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ if (op_backend->server != NULL)
|
|
|
1a0d93 |
+ {
|
|
|
1a0d93 |
+ GResolver *resolver;
|
|
|
1a0d93 |
+ GList *addresses;
|
|
|
1a0d93 |
+ GError *error = NULL;
|
|
|
1a0d93 |
+ gchar *server;
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ resolver = g_resolver_get_default ();
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ /* IPv6 server includes brackets in GMountSpec, GResolver doesn't */
|
|
|
1a0d93 |
+ if (gvfs_is_ipv6 (op_backend->server))
|
|
|
1a0d93 |
+ server = g_strndup (op_backend->server + 1, strlen (op_backend->server) - 2);
|
|
|
1a0d93 |
+ else
|
|
|
1a0d93 |
+ server = g_strdup (op_backend->server);
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ addresses = g_resolver_lookup_by_name (resolver, server, NULL, &error);
|
|
|
1a0d93 |
+ if (addresses == NULL)
|
|
|
1a0d93 |
+ {
|
|
|
1a0d93 |
+ if (error != NULL)
|
|
|
1a0d93 |
+ {
|
|
|
1a0d93 |
+ g_debug ("%s\n", error->message);
|
|
|
1a0d93 |
+ g_error_free (error);
|
|
|
1a0d93 |
+ }
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ g_debug ("Forcing NT1 protocol version\n");
|
|
|
1a0d93 |
+ smbc_setOptionProtocols (smb_context, "NT1", "NT1");
|
|
|
1a0d93 |
+ }
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ g_resolver_free_addresses (addresses);
|
|
|
1a0d93 |
+ g_object_unref (resolver);
|
|
|
1a0d93 |
+ g_free (server);
|
|
|
1a0d93 |
+ }
|
|
|
1a0d93 |
+#endif
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
icon = NULL;
|
|
|
1a0d93 |
symbolic_icon = NULL;
|
|
|
1a0d93 |
if (op_backend->server == NULL)
|
|
|
1a0d93 |
diff --git a/meson.build b/meson.build
|
|
|
1a0d93 |
index 34600188..3a876172 100644
|
|
|
1a0d93 |
--- a/meson.build
|
|
|
1a0d93 |
+++ b/meson.build
|
|
|
1a0d93 |
@@ -416,6 +416,8 @@ config_h.set10('HAVE_LIBUSB', enable_libusb)
|
|
|
1a0d93 |
enable_samba = get_option('smb')
|
|
|
1a0d93 |
if enable_samba
|
|
|
1a0d93 |
smbclient_dep = dependency('smbclient')
|
|
|
1a0d93 |
+
|
|
|
1a0d93 |
+ config_h.set('HAVE_SMBC_SETOPTIONPROTOCOLS', cc.has_function('smbc_setOptionProtocols', dependencies: smbclient_dep))
|
|
|
1a0d93 |
endif
|
|
|
1a0d93 |
|
|
|
1a0d93 |
# *** Check for libarchive ***
|