* as is, with no warranty expressed or implied.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <sys/param.h>
#include <stdlib.h>
getexportent(int fromkernel, int fromexports)
{
static struct exportent ee;
- char exp[512];
+ char exp[512], *hostname;
char rpath[MAXPATHLEN+1];
char *opt, *sp;
int ok;
/* Check for default client */
if (ok == 0)
exp[0] = '\0';
+
+ hostname = exp;
if ((opt = strchr(exp, '(')) != NULL) {
- if (opt == exp)
+ if (opt == exp) {
xlog(L_WARNING, "No host name given with %s %s, suggest *%s to avoid warning", ee.e_path, exp, exp);
+ hostname = "*";
+ }
*opt++ = '\0';
if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
syntaxerr("bad option list");
} else {
xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
}
- if (strlen(exp) >= sizeof(ee.e_hostname)) {
+ if (strlen(hostname) >= sizeof(ee.e_hostname)) {
syntaxerr("client name too long");
export_errno = EINVAL;
return NULL;
}
- strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
+ strncpy(ee.e_hostname, hostname, sizeof (ee.e_hostname) - 1);
ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0';
if (parseopts(opt, &ee, fromexports) < 0)
static int
parseopts(char *cp, struct exportent *ep, int warn)
{
- int had_sync_opt = 0;
+ int had_subtree_opt = 0;
char *flname = efname?efname:"command line";
int flline = efp?efp->x_line:0;
ep->e_flags &= ~NFSEXP_INSECURE_PORT;
else if (!strcmp(opt, "insecure"))
ep->e_flags |= NFSEXP_INSECURE_PORT;
- else if (!strcmp(opt, "sync")) {
- had_sync_opt = 1;
+ else if (!strcmp(opt, "sync"))
ep->e_flags &= ~NFSEXP_ASYNC;
- } else if (!strcmp(opt, "async")) {
- had_sync_opt = 1;
+ else if (!strcmp(opt, "async"))
ep->e_flags |= NFSEXP_ASYNC;
- } else if (!strcmp(opt, "nohide"))
+ else if (!strcmp(opt, "nohide"))
ep->e_flags |= NFSEXP_NOHIDE;
else if (!strcmp(opt, "hide"))
ep->e_flags &= ~NFSEXP_NOHIDE;
ep->e_flags |= NFSEXP_ALLSQUASH;
else if (strcmp(opt, "no_all_squash") == 0)
ep->e_flags &= ~NFSEXP_ALLSQUASH;
- else if (strcmp(opt, "subtree_check") == 0)
+ else if (strcmp(opt, "subtree_check") == 0) {
+ had_subtree_opt = 1;
ep->e_flags &= ~NFSEXP_NOSUBTREECHECK;
- else if (strcmp(opt, "no_subtree_check") == 0)
+ } else if (strcmp(opt, "no_subtree_check") == 0) {
+ had_subtree_opt = 1;
ep->e_flags |= NFSEXP_NOSUBTREECHECK;
- else if (strcmp(opt, "auth_nlm") == 0)
+ } else if (strcmp(opt, "auth_nlm") == 0)
ep->e_flags &= ~NFSEXP_NOAUTHNLM;
else if (strcmp(opt, "no_auth_nlm") == 0)
ep->e_flags |= NFSEXP_NOAUTHNLM;
ep->e_nsqgids = nsqgids;
out:
- if (warn && !had_sync_opt && !(ep->e_flags & NFSEXP_READONLY))
- 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",
+ if (warn && !had_subtree_opt)
+ xlog(L_WARNING, "%s [%d]: Neither 'subtree_check' or 'no_subtree_check' specified for export \"%s:%s\".\n"
+ " Assuming default behaviour ('subtree_check').\n"
+ " NOTE: this default will change with nfs-utils version 1.1.0\n",
flname, flline,
ep->e_hostname, ep->e_path);