summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog6
-rw-r--r--support/export/nfsctl.c5
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fd94b1..59276dd 100644
--- 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 4dcfd61..f09bf90 100644
--- 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 6612a76..19f6199 100644
--- 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);