Imported Debian patch 1.0.10-4

diff --git a/debian/README.Debian.nfsv4 b/debian/README.Debian.nfsv4
index 836a36d7bcb9d0ad688e9691d6d462f6c325047e..453e2f847bf71ad32de9431e0a7524ffd1d258cc 100644 (file)
--- a/debian/README.Debian.nfsv4
+++ b/debian/README.Debian.nfsv4
@@ -54,16 +54,18 @@ instead of a hostname to get Kerberos-based authentication instead. For this,
 you will need an "nfs/hostname@REALM" entry in /etc/krb5.keytab, as well as
 rpc.gssd running on both client and rpc.svcgssd on the server (enable them
 manually in /etc/default/nfs-common and /etc/default/nfs-kernel-server if the
-autodetection fails).
+autodetection fails). On the client, you will need to add "-o sec=krb5" to
+the mount call.
 
-If you use "gss/krb5i", you will also get integrity (ie. authentication), and
-with "gss/krb5p", you'll also get privacy (ie. encryption). Make sure your
-kernel supports this; not all kernels do.
+If you use "gss/krb5i" (and correspondingly "-o sec=krb5i" on the client), you
+will also get integrity (ie. authentication), and with "gss/krb5p", you'll also
+get privacy (ie. encryption). Make sure your kernel supports this; not all
+kernels do.
 
 If you receive messages on the server complaining about "client ID already in
-use" when mounting from more than one client, check your /etc/hosts; if your
-hostname resolves to a non-global IP (like 127.0.0.1 or 127.0.1.1, or if you
-are behind NAT) this will cause such problems currently, and you will need to
-change or remove it for NFSv4 mounts to work correctly.
+use" when mounting from more than one client, check that you have at least
+mount version 2.12r-14. Also, connecting from behind different NATs could cause
+this kind of issue currently, as two or more clients would believe they had the
+same IP.
 
  -- Steinar H. Gunderson <sesse@debian.org>, Wed, 11 Oct 2006 15:18:03 +0200

diff --git a/debian/changelog b/debian/changelog
index d4fcc39abc242c8489d1c767e07198bce0f536ef..7542774c771641157f4893f9a18357d39e9e0b4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nfs-utils (1:1.0.10-4) unstable; urgency=low
+
+  * README.Debian.nfsv4 updates.
+    * Document how to mount using GSS; previously, we only documented server
+      setup.
+    * Change the section about setclientid in the light of the new util-linux
+      version.
+  * Fix a grammatical error in the exports(5) man page; patch from Joey
+    Schultze. (Closes: #396344)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue,  7 Nov 2006 02:57:21 +0100
+
 nfs-utils (1:1.0.10-3) unstable; urgency=low
 
   * Copy the do_modprobe() definition from nfs-kernel-server.init to

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index 230258ee8754f86137404930bcc18e536a26a076..7a3e6ae4275fdd9a9d7f8f82bf348ebabe37ca24 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -124,7 +124,7 @@ default.  In all subsequence releases,
 .I sync
 is the default, and
 .I async
-must be explicit requested if needed.
+must be explicitly requested if needed.
 To help make system adminstrators aware of this change, 'exportfs'
 will issue a warning if neither
 .I sync