#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
+#include <errno.h>
#include "nfslib.h"
#include "exportfs.h"
#include "xmalloc.h"
#define EXPORT_DEFAULT_FLAGS \
(NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
+int export_errno;
+
static char *efname = NULL;
static XFILE *efp = NULL;
static int first;
ee.e_anongid = -2;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
+ ee.e_mountpoint = NULL;
ee.e_nsquids = 0;
ee.e_nsqgids = 0;
}
if (ok < 0) {
xlog(L_ERROR, "expected client(options...)");
+ export_errno = EINVAL;
return NULL;
}
first = 0;
*opt++ = '\0';
if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
syntaxerr("bad option list");
+ export_errno = EINVAL;
return NULL;
}
*sp = '\0';
}
if (strlen(exp) >= sizeof(ee.e_hostname)) {
syntaxerr("client name too long");
+ export_errno = EINVAL;
return NULL;
}
strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
fprintf(fp, "%ssync,", (ep->e_flags & NFSEXP_ASYNC)? "a" : "");
fprintf(fp, "%swdelay,", (ep->e_flags & NFSEXP_GATHERED_WRITES)?
"" : "no_");
- fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_CROSSMNT)?
+ fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_NOHIDE)?
"no" : "");
+ fprintf(fp, "%scrossmnt,", (ep->e_flags & NFSEXP_CROSSMOUNT)?
+ "" : "no");
fprintf(fp, "%ssecure,", (ep->e_flags & NFSEXP_INSECURE_PORT)?
"in" : "");
fprintf(fp, "%sroot_squash,", (ep->e_flags & NFSEXP_ROOTSQUASH)?
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:
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 *
ee.e_anongid = -2;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
+ ee.e_mountpoint = NULL;
ee.e_nsquids = 0;
ee.e_nsqgids = 0;
had_sync_opt = 1;
ep->e_flags |= NFSEXP_ASYNC;
} else if (!strcmp(opt, "nohide"))
- ep->e_flags |= NFSEXP_CROSSMNT;
+ ep->e_flags |= NFSEXP_NOHIDE;
else if (!strcmp(opt, "hide"))
- ep->e_flags &= ~NFSEXP_CROSSMNT;
- else if (!strcmp(opt, "crossmnt")) /* old style */
- ep->e_flags |= NFSEXP_CROSSMNT;
- else if (!strcmp(opt, "nocrossmnt")) /* old style */
- ep->e_flags &= ~NFSEXP_CROSSMNT;
+ ep->e_flags &= ~NFSEXP_NOHIDE;
+ else if (!strcmp(opt, "crossmnt"))
+ ep->e_flags |= NFSEXP_CROSSMOUNT;
+ else if (!strcmp(opt, "nocrossmnt"))
+ ep->e_flags &= ~NFSEXP_CROSSMOUNT;
else if (!strcmp(opt, "wdelay"))
ep->e_flags |= NFSEXP_GATHERED_WRITES;
else if (!strcmp(opt, "no_wdelay"))
if (opt[8]=='\0' || *oe != '\0') {
xlog(L_ERROR, "%s: %d: bad anonuid \"%s\"\n",
flname, flline, opt);
+bad_option:
free(opt);
+ export_errno = EINVAL;
return -1;
}
} else if (strncmp(opt, "anongid=", 8) == 0) {
if (opt[8]=='\0' || *oe != '\0') {
xlog(L_ERROR, "%s: %d: bad anongid \"%s\"\n",
flname, flline, opt);
- free(opt);
- return -1;
+ goto bad_option;
}
} else if (strncmp(opt, "squash_uids=", 12) == 0) {
if (parsesquash(opt+12, &squids, &nsquids, &cp) < 0) {
- free(opt);
- return -1;
+ goto bad_option;
}
} else if (strncmp(opt, "squash_gids=", 12) == 0) {
if (parsesquash(opt+12, &sqgids, &nsqgids, &cp) < 0) {
- free(opt);
- return -1;
+ goto bad_option;
}
} else if (strncmp(opt, "fsid=", 5) == 0) {
char *oe;
if (opt[5]=='\0' || *oe != '\0') {
xlog(L_ERROR, "%s: %d: bad fsid \"%s\"\n",
flname, flline, opt);
- free(opt);
- return -1;
+ 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);
ep->e_flags |= NFSEXP_ALLSQUASH | NFSEXP_READONLY;
- free(opt);
- return -1;
+ goto bad_option;
}
free(opt);
while (isblank(*cp))
out:
if (warn && !had_sync_opt)
- xlog(L_WARNING, "No 'sync' or 'async' option specified for export \"%s:%s\".\n"
+ xlog(L_WARNING, "%s [%d]: No 'sync' or 'async' option specified for export \"%s:%s\".\n"
" Assuming default behaviour ('sync').\n"
" NOTE: this default has changed from previous versions\n",
+
+ flname, flline,
ep->e_hostname, ep->e_path);
return 1;