summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug McCallum <Doug.McCallum@Sun.COM>2008-09-15 14:14:15 -0600
committerDoug McCallum <Doug.McCallum@Sun.COM>2008-09-15 14:14:15 -0600
commitd34e45171c2edbf3c5816d3649852f9edef70ec1 (patch)
tree7e4ac41484f4551501ae4373ef4fa2f50b679583
parentf69aeee8aea45b015d6401bac50031a29744fcae (diff)
downloadillumos-joyent-d34e45171c2edbf3c5816d3649852f9edef70ec1.tar.gz
6671094 Can't NFS share a ZFS file system with SCX 2/08 using HAStoragePlus
-rw-r--r--usr/src/lib/libshare/common/libshare_zfs.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/lib/libshare/common/libshare_zfs.c b/usr/src/lib/libshare/common/libshare_zfs.c
index ce9580908f..f50d1ab032 100644
--- a/usr/src/lib/libshare/common/libshare_zfs.c
+++ b/usr/src/lib/libshare/common/libshare_zfs.c
@@ -1278,6 +1278,17 @@ sa_share_zfs(sa_share_t share, char *path, share_t *sh,
}
/*
+ * Make sure only one leading '/' This condition came
+ * about when using HAStoragePlus which insisted on
+ * putting an extra leading '/' in the ZFS path
+ * name. The problem is fixed in other areas, but this
+ * will catch any other ways that a double slash might
+ * get introduced.
+ */
+ while (*pathp == '/' && *(pathp + 1) == '/')
+ pathp++;
+
+ /*
* chop off part of path, but if we are at root then
* make sure path is a /
*/