Imported Debian patch 1.0.10-5

diff --git a/debian/changelog b/debian/changelog
index 7542774c771641157f4893f9a18357d39e9e0b4e..d9024dbe1ce580c68bbb28e5ee4f13c9d41e23c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+nfs-utils (1:1.0.10-5) unstable; urgency=medium
+
+  * The NFS kernel server does not support uid mappings, activated with flags
+    such as "map_daemon" in exports. There is already code that parses these
+    flags, and gives an error at mount time if an unsupported flag (ie. any
+    but the default) is given. However, at some point the kernel changed the
+    export interface, and the new code forgot to include the relevant check.
+    Thus, simply copy the check from the old to the new code, which makes
+    sure mountd behaves the same in this aspect regardless of kernel version,
+    and makes sure the admin does not inadvertedly use map_daemon and expect
+    it to work. (Closes: #403232)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 21 Dec 2006 12:13:10 +0100
+
 nfs-utils (1:1.0.10-4) unstable; urgency=low
 
   * README.Debian.nfsv4 updates.

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index c57d3b0a326a16adf01c4ee9b083f01df470fab3..0296f4efd19f187ea20bcfcf1d785e8a05f29bc3 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -381,6 +381,12 @@ void cache_export(nfs_export *exp)
 {
        FILE *f;
 
+       if (exp->m_export.e_maptype != CLE_MAP_IDENT) {
+               xlog(L_ERROR, "%s: unsupported mapping; kernel supports only 'identity' (default)",
+                   exp->m_export.m_path);
+               return;
+       }
+
        f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w");
        if (!f)
                return;