2002-01-02 Chip Salzenberg <chip@pobox.com>

	* support/export/nfsctl.c (expsetup): Don't export entries that
	specify id mappings not supported by the kernel.  No extant kernel
	supports any significant mapping, only 'identity' (i.e. none).
	When other mappings are supported, this code will need changing.
	* debian/changelog: Version 1.0-2.

diff --git a/ChangeLog b/ChangeLog
index 2fd94b1212da5025c63d5ee6a98a9d4e28dab368..59276ddc2eadd396190625d29536ad3c8f564758 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-02  Chip Salzenberg  <chip@pobox.com>
+
+       * support/export/nfsctl.c (expsetup): Don't export entries that
+       specify id mappings not supported by the kernel.  No extant kernel
+       supports any significant mapping, only 'identity' (i.e. none).
+       When other mappings are supported, this code will need changing.
+       * debian/changelog: Version 1.0-2.
+
 2001-12-26  Chip Salzenberg  <chip@pobox.com>
 
        * nfs-utils.spec (Version): Set to "1.0".

diff --git a/debian/changelog b/debian/changelog
index 4dcfd6177e91ca91672cbf5a6e3fa7a33e90f426..f09bf9053e6b97ce6952d695257afa825aca6090 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.0-2) unstable; urgency=low
+
+  * Fail an export if its mapping option is unsupported.  (closes: #85678)
+
+ -- Chip Salzenberg <chip@debian.org>  Wed,  2 Jan 2002 15:52:37 -0800
+
 nfs-utils (1:1.0-1) unstable; urgency=medium
 
   * New upstream version.  (Version number is only change.)

diff --git a/support/export/nfsctl.c b/support/export/nfsctl.c
index 6612a76088464f4c5f5fe778aa2e7d7a0317067a..19f6199f6737a692fe2e1e957e1f17a9ab3eca22 100644 (file)
--- a/support/export/nfsctl.c
+++ b/support/export/nfsctl.c
@@ -89,6 +89,11 @@ expsetup(struct nfsctl_export *exparg, nfs_export *exp)
        if (stat(exp->m_export.m_path, &stb) < 0)
                return 0;
 
+       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 0;
+       }
        memset(exparg, 0, sizeof(*exparg));
        strncpy(exparg->ex_path, exp->m_export.m_path,
                sizeof (exparg->ex_path) - 1);