diff --git a/0006-junction-regression.patch b/0006-junction-regression.patch new file mode 100644 index 0000000000000000000000000000000000000000..54cb9d9ecb18e8ad54d0549369f84c9b47153e7e --- /dev/null +++ b/0006-junction-regression.patch @@ -0,0 +1,31 @@ +From 7916134e5d9b1641effd3b6d964c806a09cfdcee Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Thu, 11 Apr 2024 09:33:47 +0800 +Subject: [PATCH] Fixed a regression in the junction code + + commit cdbef4e9 created a regression in the + in the junction code by adding a O_PATH flag + to the open() in junction_open_path() + + Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2213669 + Signed-off-by: Steve Dickson +--- + support/junction/junction.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/support/junction/junction.c b/support/junction/junction.c +index 0628bb0..c1ec8ff 100644 +--- a/support/junction/junction.c ++++ b/support/junction/junction.c +@@ -63,7 +63,7 @@ junction_open_path(const char *pathname, int *fd) + if (pathname == NULL || fd == NULL) + return FEDFS_ERR_INVAL; + +- tmp = open(pathname, O_PATH|O_DIRECTORY); ++ tmp = open(pathname, O_DIRECTORY); + if (tmp == -1) { + switch (errno) { + case EPERM: +-- +2.33.0 + diff --git a/nfs-utils.spec b/nfs-utils.spec index 2705e42ad57952e8ed682f38a8c8766e8faa7083..598a356c1da89547b1da87a59ebd1e619867b3f3 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -4,7 +4,7 @@ Name: nfs-utils Version: 2.6.3 -Release: 1 +Release: 2 Epoch: 2 Summary: The Linux NFS userland utility package License: MIT and GPLv2 and GPLv2+ and BSD @@ -18,6 +18,7 @@ Patch2: 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch Patch3: 0003-export-fix-handling-of-error-from-match_fsid.patch Patch4: 0004-export-move-cache_open-before-workers-are-forked.patch Patch5: 0005-gssd-fix-handling-DNS-lookup-failure.patch +Patch6: 0006-junction-regression.patch BuildRequires: libevent-devel,libcap-devel, libtirpc-devel libblkid-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 @@ -290,6 +291,9 @@ fi %{_mandir}/*/* %changelog +* Thu Apr 11 2024 xuchenchen - 2:2.6.3-2 +- Fixed a regression in the junction code + * Wed Jan 10 2024 wuguanghao - 2:2.6.3-1 - upgrade version to 2.6.3