summaryrefslogtreecommitdiffstats
path: root/support/nfs
diff options
context:
space:
mode:
authorneilbrown <neilbrown>2003-05-30 05:16:52 +0000
committerneilbrown <neilbrown>2003-05-30 05:16:52 +0000
commitd38ea02d0e4bcdc4e0114567028596f7bcba45b9 (patch)
treea464ad88e48a90c4efa48fd4caefc843caa88d05 /support/nfs
parent936ecbb5750e0e29b9e2464998a8e03eca617b72 (diff)
downloadnfs-utils-d38ea02d0e4bcdc4e0114567028596f7bcba45b9.tar.gz
nfs-utils-d38ea02d0e4bcdc4e0114567028596f7bcba45b9.tar.xz
nfs-utils-d38ea02d0e4bcdc4e0114567028596f7bcba45b9.zip
new "mountpoint" export option.
Diffstat (limited to 'support/nfs')
-rw-r--r--support/nfs/exports.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index dfb241e..4d8665c 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -91,6 +91,7 @@ getexportent(int fromkernel, int fromexports)
ee.e_anongid = -2;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
+ ee.e_mountpoint = NULL;
ee.e_nsquids = 0;
ee.e_nsqgids = 0;
@@ -187,6 +188,10 @@ putexportent(struct exportent *ep)
if (ep->e_flags & NFSEXP_FSID) {
fprintf(fp, "fsid=%d,", ep->e_fsid);
}
+ if (ep->e_mountpoint)
+ fprintf(fp, "mountpoint%s%s,",
+ ep->e_mountpoint[0]?"=":"", ep->e_mountpoint);
+
fprintf(fp, "mapping=");
switch (ep->e_maptype) {
case CLE_MAP_IDENT:
@@ -247,6 +252,8 @@ dupexportent(struct exportent *dst, struct exportent *src)
dst->e_sqgids = (int *) xmalloc(n * sizeof(int));
memcpy(dst->e_sqgids, src->e_sqgids, n * sizeof(int));
}
+ if (src->e_mountpoint)
+ dst->e_mountpoint = strdup(src->e_mountpoint);
}
struct exportent *
@@ -260,6 +267,7 @@ mkexportent(char *hname, char *path, char *options)
ee.e_anongid = -2;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
+ ee.e_mountpoint = NULL;
ee.e_nsquids = 0;
ee.e_nsqgids = 0;
@@ -408,6 +416,15 @@ bad_option:
goto bad_option;
}
ep->e_flags |= NFSEXP_FSID;
+ } else if (strcmp(opt, "mountpoint")==0 ||
+ strcmp(opt, "mp") == 0 ||
+ strncmp(opt, "mountpoint=", 11)==0 ||
+ strncmp(opt, "mp=", 3) == 0) {
+ char * mp = strchr(opt, '=');
+ if (mp)
+ ep->e_mountpoint = strdup(mp+1);
+ else
+ ep->e_mountpoint = strdup("");
} else {
xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n",
flname, flline, opt);