From 328506d3c9afdec3f827f8116fea6d88be2d7aff Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Jan 07 2008 19:04:11 +0000 Subject: - Fixed typo in rpc.mountd man page - Turn on 'nohide' automatically for all refer exports (bz 313561) --- diff --git a/nfs-utils-1.1.0-fsloc-nohide.patch b/nfs-utils-1.1.0-fsloc-nohide.patch new file mode 100644 index 0000000..8b4a56b --- /dev/null +++ b/nfs-utils-1.1.0-fsloc-nohide.patch @@ -0,0 +1,73 @@ +diff -up nfs-utils-1.1.0/utils/mountd/cache.c.orig nfs-utils-1.1.0/utils/mountd/cache.c +--- nfs-utils-1.1.0/utils/mountd/cache.c.orig 2007-05-10 23:40:57.000000000 -0400 ++++ nfs-utils-1.1.0/utils/mountd/cache.c 2008-01-07 13:56:02.000000000 -0500 +@@ -78,6 +78,8 @@ void auth_unix_ip(FILE *f) + if (readline(fileno(f), &lbuf, &lbuflen) != 1) + return; + ++ xlog(D_CALL, "auth_unix_ip: inbuf '%s'", lbuf); ++ + cp = lbuf; + + if (qword_get(&cp, class, 20) <= 0 || +@@ -102,6 +104,7 @@ void auth_unix_ip(FILE *f) + if (client) + qword_print(f, *client?client:"DEFAULT"); + qword_eol(f); ++ xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, *client?client: "DEFAULT"); + + if (client) free(client); + +@@ -273,8 +276,10 @@ void nfsd_fh(FILE *f) + if (readline(fileno(f), &lbuf, &lbuflen) != 1) + return; + +- cp = lbuf; ++ xlog(D_CALL, "nfsd_fh: inbuf '%s'", lbuf); + ++ cp = lbuf; ++ + dom = malloc(strlen(cp)); + if (dom == NULL) + return; +@@ -492,6 +497,7 @@ void nfsd_fh(FILE *f) + qword_eol(f); + out: + free(dom); ++ xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL); + return; + } + +@@ -563,6 +569,8 @@ void nfsd_export(FILE *f) + if (readline(fileno(f), &lbuf, &lbuflen) != 1) + return; + ++ xlog(D_CALL, "nfsd_export: inbuf '%s'", lbuf); ++ + cp = lbuf; + dom = malloc(strlen(cp)); + path = malloc(strlen(cp)); +@@ -634,6 +642,7 @@ void nfsd_export(FILE *f) + dump_to_cache(f, dom, path, NULL); + } + out: ++ xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL); + if (dom) free(dom); + if (path) free(path); + } +diff -up nfs-utils-1.1.0/support/nfs/exports.c.orig nfs-utils-1.1.0/support/nfs/exports.c +--- nfs-utils-1.1.0/support/nfs/exports.c.orig 2008-01-07 13:54:36.000000000 -0500 ++++ nfs-utils-1.1.0/support/nfs/exports.c 2008-01-07 13:56:02.000000000 -0500 +@@ -508,6 +508,12 @@ bad_option: + while (isblank(*cp)) + cp++; + } ++ /* ++ * Turn on nohide which will allow this export to cross over ++ * the 'mount --bind' mount point. ++ */ ++ if (ep->e_fslocdata) ++ ep->e_flags |= NFSEXP_NOHIDE; + + ep->e_squids = squids; + ep->e_sqgids = sqgids; diff --git a/nfs-utils-1.1.1-mountd-man.patch b/nfs-utils-1.1.1-mountd-man.patch new file mode 100644 index 0000000..44d41ae --- /dev/null +++ b/nfs-utils-1.1.1-mountd-man.patch @@ -0,0 +1,21 @@ +commit 7c6a4ae0aff5c2cd5fde2909e8af886ccf0bd27d +Author: Steve Dickson +Date: Mon Jan 7 10:39:37 2008 -0500 + + Fixed typo in rpc.mountd's man page + + Signed-off-by: Steve Dickson + +diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man +index 4276663..2f42d00 100644 +--- a/utils/mountd/mountd.man ++++ b/utils/mountd/mountd.man +@@ -119,7 +119,7 @@ The third will be the path that the client is mounting. + The last is the number of concurrent mounts that we believe the client + has of that path. + .TP +-.BI "\-P," "" " \-\-state\-directory\-path " directory ++.BI "\-s," "" " \-\-state\-directory\-path " directory + specify a directory in which to place statd state information. + If this option is not specified the default of + .BR /var/lib/nfs diff --git a/nfs-utils.spec b/nfs-utils.spec index 5b61e04..f0a6270 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 # group all 32bit related archs @@ -36,6 +36,8 @@ Patch10: nfs-utils-1.1.0-exportfs-open.patch Patch11: nfs-utils-1.1.0-smnotify-path.patch Patch12: nfs-utils-1.1.0-exportfs-man-update.patch Patch13: nfs-utils-1.1.0-gssglue.patch +Patch14: nfs-utils-1.1.1-mountd-man.patch +Patch15: nfs-utils-1.1.0-fsloc-nohide.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -102,6 +104,8 @@ This package also contains the mount.nfs and umount.nfs program. %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 %if %{enablefscache} %patch90 -p1 @@ -272,6 +276,10 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Jan 7 2008 Steve Dickson 1.1.0-7 +- Fixed typo in rpc.mountd man page +- Turn on 'nohide' automatically for all refer exports (bz 313561) + * Wed Oct 17 2007 Steve Dickson 1.1.0-6 - Switch the libgssapi dependency to libgssglue