44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
|
||
|
|
index 33d1a209..776b67bc 100644
|
||
|
|
--- a/daemon/gvfsbackendsmb.c
|
||
|
|
+++ b/daemon/gvfsbackendsmb.c
|
||
|
|
@@ -513,7 +513,13 @@ do_mount (GVfsBackend *backend,
|
||
|
|
if (res == 0)
|
||
|
|
break;
|
||
|
|
|
||
|
|
- if (op_backend->mount_cancelled || (errsv != EACCES && errsv != EPERM))
|
||
|
|
+ if (errsv == EINVAL && op_backend->mount_try == 0 && op_backend->user == NULL)
|
||
|
|
+ {
|
||
|
|
+ /* EINVAL is "expected" when kerberos/ccache is misconfigured, see:
|
||
|
|
+ * https://gitlab.gnome.org/GNOME/gvfs/-/issues/611
|
||
|
|
+ */
|
||
|
|
+ }
|
||
|
|
+ else if (op_backend->mount_cancelled || (errsv != EACCES && errsv != EPERM))
|
||
|
|
{
|
||
|
|
g_debug ("do_mount - (errno != EPERM && errno != EACCES), cancelled = %d, breaking\n", op_backend->mount_cancelled);
|
||
|
|
break;
|
||
|
|
diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
|
||
|
|
index 57bae9db..7e8facfb 100644
|
||
|
|
--- a/daemon/gvfsbackendsmbbrowse.c
|
||
|
|
+++ b/daemon/gvfsbackendsmbbrowse.c
|
||
|
|
@@ -967,8 +967,14 @@ do_mount (GVfsBackend *backend,
|
||
|
|
uri, op_backend->mount_try, dir, op_backend->mount_cancelled,
|
||
|
|
errsv, g_strerror (errsv));
|
||
|
|
|
||
|
|
- if (dir == NULL &&
|
||
|
|
- (op_backend->mount_cancelled || (errsv != EPERM && errsv != EACCES)))
|
||
|
|
+ if (errsv == EINVAL && op_backend->mount_try == 0 && op_backend->user == NULL)
|
||
|
|
+ {
|
||
|
|
+ /* EINVAL is "expected" when kerberos is misconfigured, see:
|
||
|
|
+ * https://gitlab.gnome.org/GNOME/gvfs/-/issues/611
|
||
|
|
+ */
|
||
|
|
+ }
|
||
|
|
+ else if (dir == NULL &&
|
||
|
|
+ (op_backend->mount_cancelled || (errsv != EPERM && errsv != EACCES)))
|
||
|
|
{
|
||
|
|
g_debug ("do_mount - (errno != EPERM && errno != EACCES), cancelled = %d, breaking\n", op_backend->mount_cancelled);
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|