- fix nfsv3 fh length in NFS_FH_DREF().
This commit is contained in:
parent
140f0698e9
commit
39097857d1
|
@ -0,0 +1,26 @@
|
|||
am-utils-6.2 - fix nfsv3 fh length in NFS_FH_DREF()
|
||||
|
||||
From: Ian Kent <ikent@redhat.com>
|
||||
|
||||
The NFS_FH_DREF() macro for linux uses sizeof(struct nfs_fh) for the
|
||||
length of the file handle copy regardless of the version of NFS used.
|
||||
|
||||
But NFSv3 file handles are 64 bytes and not copying the whole file
|
||||
handle can cause automounts to fail.
|
||||
|
||||
Changing this to use the size of the passed nfs file handle fixes
|
||||
the problem.
|
||||
|
||||
Signed-off-by: Ian Kent <ikent@redhat.com>
|
||||
---
|
||||
conf/fh_dref/fh_dref_linux.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/conf/fh_dref/fh_dref_linux.h b/conf/fh_dref/fh_dref_linux.h
|
||||
index 7ffa5b50..f8fb1a89 100644
|
||||
--- a/conf/fh_dref/fh_dref_linux.h
|
||||
+++ b/conf/fh_dref/fh_dref_linux.h
|
||||
@@ -1,2 +1,2 @@
|
||||
/* $srcdir/conf/fh_dref/fh_dref_linux.h */
|
||||
-#define NFS_FH_DREF(dst, src) memcpy((char *) &(dst.data), (char *) src, sizeof(struct nfs_fh))
|
||||
+#define NFS_FH_DREF(dst, src) memcpy((char *) &(dst.data), (char *) src, sizeof(*src))
|
|
@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd
|
|||
Name: am-utils
|
||||
Version: 6.2.0
|
||||
%define upstream_version 6.2
|
||||
Release: 26%{?dist}
|
||||
Release: 27%{?dist}
|
||||
License: BSD
|
||||
Epoch: 5
|
||||
Group: System Environment/Daemons
|
||||
|
@ -83,6 +83,8 @@ Patch32: am-utils-6.2-fix-compiler-assignment-warning-due-to-libtirpc.patch
|
|||
Patch33: am-utils-6.2-fix-logical-not-comparison-in-get_ldap_timestamp.patch
|
||||
Patch34: am-utils-6.2-fix-umount-to-mount-race.patch
|
||||
|
||||
Patch35: am-utils-6.2-fix-nfsv3-fh-length-in-NFS_FH_DREF.patch
|
||||
|
||||
# Not needed since autoreconf/libtool appear to do this automatically
|
||||
# Leaving it set doesn't appear to be a problem so leave it set in
|
||||
# case this changes.
|
||||
|
@ -140,6 +142,7 @@ mounting and unmounting filesystems.
|
|||
%patch32 -p1
|
||||
%patch33 -p1
|
||||
%patch34 -p1
|
||||
%patch35 -p1
|
||||
|
||||
./bootstrap
|
||||
|
||||
|
@ -251,6 +254,9 @@ fi
|
|||
%{_libdir}/libamu.so*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 24 2017 Ian Kent <ikent@redhat.com> - 5:6.2.0-27
|
||||
- fix nfsv3 fh length in NFS_FH_DREF().
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue