Fixed a regression in the junction code (bz 2213669)

Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: bz2213669
This commit is contained in:
Steve Dickson 2023-08-07 16:20:40 -04:00
parent aab9bfd888
commit b3e8f0caaa
2 changed files with 4 additions and 10 deletions

View File

@ -31,15 +31,6 @@ diff --git a/support/junction/junction.c b/support/junction/junction.c
index 41cce26..0628bb0 100644 index 41cce26..0628bb0 100644
--- a/support/junction/junction.c --- a/support/junction/junction.c
+++ b/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_DIRECTORY);
+ tmp = open(pathname, O_PATH|O_DIRECTORY);
if (tmp == -1) {
switch (errno) {
case EPERM:
@@ -93,7 +93,7 @@ junction_is_directory(int fd, const char *path) @@ -93,7 +93,7 @@ junction_is_directory(int fd, const char *path)
{ {
struct stat stb; struct stat stb;

View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://linux-nfs.org/ URL: http://linux-nfs.org/
Version: 2.5.4 Version: 2.5.4
Release: 19%{?dist} Release: 20%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -488,6 +488,9 @@ fi
%{_mandir}/*/nfsiostat.8.gz %{_mandir}/*/nfsiostat.8.gz
%changelog %changelog
* Mon Aug 7 2023 Steve Dickson <steved@redhat.com> 2.5.4-20
- Fixed a regression in the junction code (bz 2213669)
* Tue Jun 6 2023 Steve Dickson <steved@redhat.com> 2.5.4-19 * Tue Jun 6 2023 Steve Dickson <steved@redhat.com> 2.5.4-19
- Don't allow junction tests to trigger automounts (bz 2148353) - Don't allow junction tests to trigger automounts (bz 2148353)
- Fix typo in man page nfs.conf.man (bz 2203092) - Fix typo in man page nfs.conf.man (bz 2203092)