rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel9.patch, 1.1, 1.2 nfs-utils.spec, 1.256, 1.257
Steve Dickson
steved at fedoraproject.org
Thu Dec 10 19:24:28 UTC 2009
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15474
Modified Files:
nfs-utils-1.2.0-v4root-rel9.patch nfs-utils.spec
Log Message:
Update the pseudo root to handle security flavors better.
nfs-utils-1.2.0-v4root-rel9.patch:
support/export/xtab.c | 6 +
support/include/nfs/export.h | 3
support/include/pseudoflavors.h | 1
support/include/v4root.h | 15 ++
support/nfs/exports.c | 24 +++-
utils/mountd/Makefile.am | 2
utils/mountd/auth.c | 3
utils/mountd/mountd.c | 4
utils/mountd/v4root.c | 218 ++++++++++++++++++++++++++++++++++++++++
9 files changed, 270 insertions(+), 6 deletions(-)
Index: nfs-utils-1.2.0-v4root-rel9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.0-v4root-rel9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-v4root-rel9.patch 7 Dec 2009 13:22:33 -0000 1.1
+++ nfs-utils-1.2.0-v4root-rel9.patch 10 Dec 2009 19:24:27 -0000 1.2
@@ -172,10 +172,10 @@ index 888fd8c..179ef17 100644
break;
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
new file mode 100644
-index 0000000..817dfb4
+index 0000000..b1e483a
--- /dev/null
+++ b/utils/mountd/v4root.c
-@@ -0,0 +1,228 @@
+@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ *
@@ -375,12 +375,6 @@ index 0000000..817dfb4
+ }
+ }
+
-+ if (insecure && secflavors) {
-+ xlog(L_WARNING, "WARNING: The 'sec=' and 'insecure' export options "
-+ "are incompatible, causing the security flavors set by "
-+ "'sec=' to be ignored on V4 exports");
-+ }
-+
+ /*
+ * If there are any insecure exports, the pseudo root
+ * also has to be insecure
@@ -391,16 +385,12 @@ index 0000000..817dfb4
+
+ /*
+ * Make sure the pseudo root is accessible from all
-+ * security flavors unless the insecure port is set,
-+ * which cause the kernel to silently fail v4 mounts
-+ * with security flavors set.
++ * security flavors when it needs to be.
+ */
-+ if (secflavors && !insecure) {
-+ if (!flavors_setall(proot)) {
-+ xlog(L_WARNING, "v4root_set: Unable to set security "
-+ "flavors on pseudo root");
-+ }
++ if (secflavors && !flavors_setall(proot)) {
++ xlog(L_WARNING, "v4root_set: Unable to set security "
++ "flavors on pseudo root");
+ }
-+}
+
++}
+
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- nfs-utils.spec 7 Dec 2009 22:50:35 -0000 1.256
+++ nfs-utils.spec 10 Dec 2009 19:24:27 -0000 1.257
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -250,6 +250,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Thu Dec 10 2009 Steve Dickson <steved at redhat.com> 1.2.1-6
+- Update the pseudo root to handle security flavors better.
+
* Mon Dec 7 2009 Steve Dickson <steved at redhat.com> 1.2.1-5
- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
More information about the fedora-extras-commits
mailing list