packages/gvfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!41 [sync] PR-40: Ignore EINVAL for kerberos/ccache login

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @open123bot 
Signed-off-by: @open123bot
This commit is contained in:
openeuler-ci-bot 2023-11-02 03:24:22 +00:00 committed by Gitee
commit c670276151
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Ignore-EINVAL-for-kerberos-ccache-login.patch Normal file
View File

@ -0,0 +1,53 @@
From f99a48e982375e9ff5e98f36f1038cefd182e03c Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 26 Oct 2023 17:20:22 +0800
Subject: [PATCH] Ignore EINVAL for kerberos/ccache login
---
daemon/gvfsbackendsmb.c | 10 ++++++++--
daemon/gvfsbackendsmbbrowse.c | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
index b8319c6..67c4570 100644
--- a/daemon/gvfsbackendsmb.c
+++ b/daemon/gvfsbackendsmb.c
@@ -502,8 +502,14 @@ do_mount (GVfsBackend *backend,
if (res == 0)
break;
-
- if (op_backend->mount_cancelled || (errsv != EACCES && errsv != EPERM))
+
+ if (errsv == EINVAL && op_backend->mount_try <= 1 && 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 3b11883..b3bb7b2 100644
--- a/daemon/gvfsbackendsmbbrowse.c
+++ b/daemon/gvfsbackendsmbbrowse.c
@@ -957,7 +957,13 @@ do_mount (GVfsBackend *backend,
uri, op_backend->mount_try, dir, op_backend->mount_cancelled,
errsv, g_strerror (errsv));
- if (dir == NULL &&
+ 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);
--
2.33.0

7
gvfs.spec
View File

@ -23,14 +23,14 @@
Name: gvfs
Version: 1.46.2
Release: 3
Release: 4
Summary: gvfs is a backends for the gio framework in GLib
License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
URL: https://wiki.gnome.org/Projects/gvfs
Source0: https://download.gnome.org/sources/gvfs/1.46/gvfs-%{version}.tar.xz
Patch0: 0001-Fix-memory-leaks-detected-by-valgrind.patch
Patch1: Ignore-EINVAL-for-kerberos-ccache-login.patch
BuildRequires: /usr/bin/ssh git pkgconfig fuse3
BuildRequires: meson gcc pkgconfig pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(dbus-glib-1) pkgconfig(gcr-3)
BuildRequires: openssl-devel pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
@ -218,6 +218,9 @@ killall -USR1 gvfsd >&/dev/null || :
%{_mandir}/man1/gvfsd-fuse.1*
%changelog
* Thu Oct 26 2023 peijiankang <peijiankang@kylinos.cn> - 1.46.2-4
- Ignore EINVAL for kerberos/ccache login
* Fri Jul 28 2023 haomimi <haomimi@uniontech.com> - 1.46.2-3
- Fix memory leaks detected by valgrind