+nfs-utils (1:1.2.3-1) unstable; urgency=low
+
+ * New upstream release
+ - 7-remove-duplicate-exports-paragraphs : removed
+ - 12-svcgssd-document-n-option: updated
+ - 14-allow-address-without-name : removed
+ - 15-mountd-fix-path-comparison-for-v4-crossmnt : removed
+ - 16-mount.nfs.man-nfs.man-update-distinction-between-fstypes:
+ part about nfs.man removed and
+ renamed to 16-mount.nfs.man-update-distinction-between-fstypes
+
+ -- Luk Claes <luk@debian.org> Sun, 20 Mar 2011 16:54:52 +0100
+
nfs-utils (1:1.2.2-5) unstable; urgency=low
[ Ben Hutchings ]
+++ /dev/null
---- a/utils/exportfs/exports.man 2010-02-18 23:35:00.000000000 +1100
-+++ b/utils/exportfs/exports.man 2010-04-06 16:12:51.000000000 +1000
-@@ -365,20 +365,6 @@ If the client asks for alternative locat
- will be given this list of alternatives. (Note that actual replication
- of the filesystem must be handled elsewhere.)
-
--.TP
--.IR refer= path@host[+host][:path@host[+host]]
--A client referencing the export point will be directed to choose from
--the given list an alternative location for the filesystem.
--(Note that the server must have a mountpoint here, though a different
--filesystem is not required; so, for example,
--.IR "mount --bind" " /path /path"
--is sufficient.)
--.TP
--.IR replicas= path@host[+host][:path@host[+host]]
--If the client asks for alternative locations for the export point, it
--will be given this list of alternatives. (Note that actual replication
--of the filesystem must be handled elsewhere.)
--
- .SS User ID Mapping
- .PP
- .I nfsd
+Do not search for nfs/<your.host>@<YOUR.REALM> at start up, but instead
+accept requests for any key in the keytab file. Useful for HA clusters
+where the NFS service hostname is different from the node hostname.
-
- .SH SEE ALSO
- .BR rpc.gssd(8),
+ .TP
+ .B -p
+ Use \fIprincipal\fR instead of the default nfs/host.domain.
+++ /dev/null
-From e22f5a9c8e53a2373e8a939771e964ad315cdc5f Mon Sep 17 00:00:00 2001
-From: Chuck Lever <chuck.lever@oracle.com>
-Date: Tue, 24 Aug 2010 07:16:10 -0400
-Subject: [PATCH] statd: statd fails to monitor if no reverse mapping of mon_name exists
-
-Commit 8ce130c4 switched in the new statd_canonical_name() function
-that constructs a "unique" name statd can use to uniquely identify a
-monitor record.
-
-The legacy statd would monitor a client that sent an IP address with
-no reverse map as its caller_name. To remain bug-for-bug compatible,
-allow this case in the new statd.
-
-This shouldn't be a problem: statd_canonical_name() needs to create
-a unique name for the monitored host so it can keep track of monitor
-requests from the same remote. The IP address itself should work as
-well as the host's canonical name, in case there is no reverse
-mapping.
-
-We still enforce the requirement that a mon_name that is a DNS name
-must have a forward map to an IP address.
-
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/statd/hostname.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/utils/statd/hostname.c b/utils/statd/hostname.c
-index 7d704cc..38f2265 100644
---- a/utils/statd/hostname.c
-+++ b/utils/statd/hostname.c
-@@ -212,7 +212,9 @@ statd_canonical_name(const char *hostname)
- buf, (socklen_t)sizeof(buf));
- freeaddrinfo(ai);
- if (!result)
-- return NULL;
-+ /* OK to use presentation address,
-+ * if no reverse map exists */
-+ return strdup(hostname);
- return strdup(buf);
- }
-
---
-1.7.1
-
+++ /dev/null
-From a064fde8c2615333227de97d159bb338d4ac640d Mon Sep 17 00:00:00 2001
-From: J. Bruce Fields <bfields@citi.umich.edu>
-Date: Mon, 8 Mar 2010 14:59:01 -0500
-Subject: [PATCH] mountd: fix path comparison for v4 crossmnt
-
-This was obviously wrong, since path[strlen(path)] == '\0'
-should always be true.
-
-Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/mountd/cache.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
-index b6c148f..45397db 100644
---- a/utils/mountd/cache.c
-+++ b/utils/mountd/cache.c
-@@ -619,7 +619,7 @@ static int is_subdirectory(char *subpath, char *path)
- int l = strlen(path);
-
- return strcmp(subpath, path) == 0
-- || (strncmp(subpath, path, l) == 0 && path[l] == '/');
-+ || (strncmp(subpath, path, l) == 0 && subpath[l] == '/');
- }
-
- static int path_matches(nfs_export *exp, char *path)
---
-1.7.1
-
+++ /dev/null
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: [PATCH] mount.nfs.man, nfs.man: Update distinction between fstypes
-
-This addresses Debian bug #575503.
-
---- nfs-utils.orig/utils/mount/mount.nfs.man
-+++ nfs-utils/utils/mount/mount.nfs.man
-@@ -15,16 +15,20 @@
- .BR mount (8)
- command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
-
--.BR mount.nfs4
--is used for mounting NFSv4 file system, while
--.BR mount.nfs
--is used to mount NFS file systems versions 3 or 2.
- .I remotetarget
- is a server share usually in the form of
- .BR servername:/path/to/share.
- .I dir
- is the directory on which the file system is to be mounted.
-
-+Under Linux 2.6.32 and later kernel versions,
-+.BR mount.nfs
-+can mount all NFS file system versions. Under earlier Linux kernel versions,
-+.BR mount.nfs4
-+must be used for mounting NFSv4 file systems while
-+.BR mount.nfs
-+must be used for NFSv3 and v2.
-+
- .SH OPTIONS
- .TP
- .BI "\-r"
---- nfs-utils.orig/utils/mount/nfs.man
-+++ nfs-utils/utils/mount/nfs.man
-@@ -71,14 +71,9 @@
- .P
- The
- .I fstype
--field contains either "nfs" (for version 2 or version 3 NFS mounts)
--or "nfs4" (for NFS version 4 mounts).
--The
--.B nfs
--and
--.B nfs4
--file system types share similar mount options,
--which are described below.
-+field usually contains "nfs". For NFSv4 file systems on Linux
-+kernel versions before 2.6.32, it must contain "nfs4" (this is
-+also supported on later versions).
- .SH "MOUNT OPTIONS"
- Refer to
- .BR mount (8)
-@@ -89,14 +84,23 @@
- in
- .IR /etc/fstab .
- .DT
--.SS "Valid options for either the nfs or nfs4 file system type"
--These options are valid to use when mounting either
--.B nfs
--or
--.B nfs4
--file system types.
-+.SS "Valid options for all NFS file system versions"
- They imply the same behavior
--and have the same default for both file system types.
-+and have the same default for all file system versions.
-+.TP 1.5i
-+.BI nfsvers= n
-+The NFS protocol version number used to contact the server's NFS service.
-+If the server does not support the requested version,
-+the mount request fails.
-+If this option is not specified, the client attempts to use the latest
-+version (4 or 3), but negotiates the NFS version with the server if this
-+is not available.
-+.TP 1.5i
-+.BI vers= n
-+This option is an alternative to the
-+.B nfsvers
-+option.
-+It is included for compatibility with other operating systems.
- .TP 1.5i
- .BR soft " / " hard
- Determines the recovery behavior of the NFS client
-@@ -476,11 +480,7 @@
- .IP
- The DATA AND METADATA COHERENCE section contains a
- detailed discussion of these trade-offs.
--.SS "Valid options for the nfs file system type"
--Use these options, along with the options in the above subsection,
--for mounting the
--.B nfs
--file system type.
-+.SS "Valid options for NFSv2 and v3 file systems"
- .TP 1.5i
- .BI proto= netid
- The transport protocol name and protocol family the NFS client uses
-@@ -621,23 +621,6 @@
- reports the proper maximum component length to applications
- in such cases.
- .TP 1.5i
--.BI nfsvers= n
--The NFS protocol version number used to contact the server's NFS service.
--The Linux client supports version 2 and version 3 of the NFS protocol
--when using the file system type
--.BR nfs .
--If the server does not support the requested version,
--the mount request fails.
--If this option is not specified, the client attempts to use version 3,
--but negotiates the NFS version with the server if version 3 support
--is not available.
--.TP 1.5i
--.BI vers= n
--This option is an alternative to the
--.B nfsvers
--option.
--It is included for compatibility with other operating systems.
--.TP 1.5i
- .BR lock " / " nolock
- Selects whether to use the NLM sideband protocol to lock files on the server.
- If neither option is specified (or if
-@@ -727,11 +710,7 @@
- on NFS version 3 mounts to read small directories.
- Some applications perform better if the client uses only READDIR requests
- for all directories.
--.SS "Valid options for the nfs4 file system type"
--Use these options, along with the options in the first subsection above,
--for mounting the
--.B nfs4
--file system type.
-+.SS "Valid options for NFSv4 file systems"
- .TP 1.5i
- .BI proto= netid
- The transport protocol name and protocol family the NFS client uses
-@@ -851,12 +830,11 @@
- To mount using NFS version 4,
- use the
- .B nfs4
--file system type.
--The
--.B nfsvers
--mount option is not supported for the
--.B nfs4
--file system type.
-+file system type or (from Linux 2.6.32) use the
-+.B nfs
-+file system type and specify the
-+.B nfsvers=4
-+mount option.
- .P
- The following example from an
- .I /etc/fstab
--- /dev/null
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: [PATCH] mount.nfs.man, nfs.man: Update distinction between fstypes
+
+This addresses Debian bug #575503.
+
+--- nfs-utils.orig/utils/mount/mount.nfs.man
++++ nfs-utils/utils/mount/mount.nfs.man
+@@ -15,16 +15,20 @@
+ .BR mount (8)
+ command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
+
+-.BR mount.nfs4
+-is used for mounting NFSv4 file system, while
+-.BR mount.nfs
+-is used to mount NFS file systems versions 3 or 2.
+ .I remotetarget
+ is a server share usually in the form of
+ .BR servername:/path/to/share.
+ .I dir
+ is the directory on which the file system is to be mounted.
+
++Under Linux 2.6.32 and later kernel versions,
++.BR mount.nfs
++can mount all NFS file system versions. Under earlier Linux kernel versions,
++.BR mount.nfs4
++must be used for mounting NFSv4 file systems while
++.BR mount.nfs
++must be used for NFSv3 and v2.
++
+ .SH OPTIONS
+ .TP
+ .BI "\-r"
01-sm-notify-in-sbin.patch
02-524255-manpages.patch
03-handle-mtab-symlink.patch
-07-remove-duplicate-exports-paragraphs.patch
11-532048-reduce-verbosity.patch
12-svcgssd-document-n-option.patch
13-preserve-explicit-port-2049.patch
-14-allow-address-without-name.patch
-15-mountd-fix-path-comparison-for-v4-crossmnt.patch
-16-mount.nfs.man-nfs.man-update-distinction-between-fstypes.patch
+16-mount.nfs.man-update-distinction-between-fstype.patch
projects / nfs-utils.git / commitdiff