Updated to latest major release: nfs-utils-1-3-0
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
d96c524fb3
commit
e956a447ee
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ Makefile
|
|||||||
/nfs-utils-1.2.8
|
/nfs-utils-1.2.8
|
||||||
/nfs-utils-1.2.8.tar.bz2
|
/nfs-utils-1.2.8.tar.bz2
|
||||||
/nfs-utils-1.2.9.tar.bz2
|
/nfs-utils-1.2.9.tar.bz2
|
||||||
|
/nfs-utils-1.3.0.tar.xz
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,53 +0,0 @@
|
|||||||
commit 2f682f25c642fcfe7c511d04bc9d67e732282348
|
|
||||||
Author: Jeff Layton <jlayton@redhat.com>
|
|
||||||
Date: Wed Jan 22 11:17:19 2014 -0500
|
|
||||||
|
|
||||||
gssd: set $HOME to prevent recursion when home dirs are on kerberized NFS mount
|
|
||||||
|
|
||||||
Some krb5 routines will attempt to access files in the user's home
|
|
||||||
directory. This is problematic for gssd when the user's homedir is
|
|
||||||
on a kerberized NFS mount as it will end up deadlocked.
|
|
||||||
|
|
||||||
Fix this by setting $HOME unconditionally to "/".
|
|
||||||
|
|
||||||
Fixes this Fedora bug:
|
|
||||||
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1052902
|
|
||||||
|
|
||||||
Reported-by: Enrico Scholz <rh-bugzilla@ensc.de>
|
|
||||||
Reported-by: nmorey <nmorey@kalray.eu>
|
|
||||||
Tested-by: Michael Young <m.a.young@durham.ac.uk>
|
|
||||||
Signed-off-by: Jeff Layton <jlayton@redhat.com>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
|
|
||||||
index fdad153..611ef1a 100644
|
|
||||||
--- a/utils/gssd/gssd.c
|
|
||||||
+++ b/utils/gssd/gssd.c
|
|
||||||
@@ -46,6 +46,7 @@
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <err.h>
|
|
||||||
+#include <errno.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
@@ -161,6 +162,18 @@ main(int argc, char *argv[])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * Some krb5 routines try to scrape info out of files in the user's
|
|
||||||
+ * home directory. This can easily deadlock when that homedir is on a
|
|
||||||
+ * kerberized NFS mount. By setting $HOME unconditionally to "/", we
|
|
||||||
+ * prevent this behavior in routines that use $HOME in preference to
|
|
||||||
+ * the results of getpw*.
|
|
||||||
+ */
|
|
||||||
+ if (setenv("HOME", "/", 1)) {
|
|
||||||
+ printerr(1, "Unable to set $HOME: %s\n", strerror(errno));
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
i = 0;
|
|
||||||
ccachesearch[i++] = strtok(ccachedir, ":");
|
|
||||||
do {
|
|
@ -1,14 +1,14 @@
|
|||||||
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
||||||
Name: nfs-utils
|
Name: nfs-utils
|
||||||
URL: http://sourceforge.net/projects/nfs
|
URL: http://sourceforge.net/projects/nfs
|
||||||
Version: 1.2.9
|
Version: 1.3.0
|
||||||
Release: 3.0%{?dist}
|
Release: 0.0%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
# group all 32bit related archs
|
# group all 32bit related archs
|
||||||
%define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9
|
%define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9
|
||||||
|
|
||||||
Source0: http://sourceforge.net/projects/nfs/files/nfs-utils/%{version}/%{name}-%{version}.tar.bz2
|
Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Source9: id_resolver.conf
|
Source9: id_resolver.conf
|
||||||
Source10: nfs.sysconfig
|
Source10: nfs.sysconfig
|
||||||
@ -36,9 +36,6 @@ Source51: nfs-server.preconfig
|
|||||||
Source52: nfs-server.postconfig
|
Source52: nfs-server.postconfig
|
||||||
%define nfs_configs %{SOURCE50} %{SOURCE51} %{SOURCE52}
|
%define nfs_configs %{SOURCE50} %{SOURCE51} %{SOURCE52}
|
||||||
|
|
||||||
Patch001: nfs-utils-1.2.10-rc3.patch
|
|
||||||
Patch002: nfs-utils-1.2.9-gssd-home.patch
|
|
||||||
|
|
||||||
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
||||||
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
||||||
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
|
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
|
||||||
@ -95,9 +92,6 @@ This package also contains the mount.nfs and umount.nfs program.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch001 -p1
|
|
||||||
%patch002 -p1
|
|
||||||
|
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
@ -313,6 +307,9 @@ fi
|
|||||||
/sbin/umount.nfs4
|
/sbin/umount.nfs4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 25 2014 Steve Dickson <steved@redhat.com> 1.3.0-0.0
|
||||||
|
- Updated to latest major release: nfs-utils-1-3-0
|
||||||
|
|
||||||
* Wed Jan 22 2014 Steve Dickson <steved@redhat.com> 1.2.9-3.0
|
* Wed Jan 22 2014 Steve Dickson <steved@redhat.com> 1.2.9-3.0
|
||||||
- Updated to latest upstream RC release: nfs-utils-1-2-10-rc3
|
- Updated to latest upstream RC release: nfs-utils-1-2-10-rc3
|
||||||
- gssd: Improve first attempt at acquiring GSS credentials (bz 1055077)
|
- gssd: Improve first attempt at acquiring GSS credentials (bz 1055077)
|
||||||
|
Loading…
Reference in New Issue
Block a user