* 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;
ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
}
ee.e_maptype = CLE_MAP_IDENT;
- ee.e_anonuid = -2;
- ee.e_anongid = -2;
+ ee.e_anonuid = 65534;
+ ee.e_anongid = 65534;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
ee.e_mountpoint = NULL;
/* 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)
fp = efp->x_fp;
for (i=0; esc[i]; i++)
- if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\'|| isspace(esc[i]))
+ if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\' || esc[i] == '#' || isspace(esc[i]))
fprintf(fp, "\\%03o", esc[i]);
else
fprintf(fp, "%c", esc[i]);
ee.e_flags = EXPORT_DEFAULT_FLAGS;
ee.e_maptype = CLE_MAP_IDENT;
- ee.e_anonuid = -2;
- ee.e_anongid = -2;
+ ee.e_anonuid = 65534;
+ ee.e_anongid = 65534;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
ee.e_mountpoint = NULL;
the export name using a backslash followed by the character code as three
octal digits.
.PP
+To apply changes to this file, run exportfs -ra or (on Debian)
+/etc/init.d/nfs-kernel-server reload.
+.PP
.SS Machine Name Formats
NFS clients may be specified in a number of ways:
.IP "single host
an unclean server restart (i.e. a crash) can cause data to be lost or
corrupted.
+.TP
+.IR sync
+Reply to requests only after the changes have been committed to stable
+storage (see
+.IR async
+above).
+
In releases of nfs-utils upto and including 1.0.0, this option was the
default. In this and future releases,
.I sync
The option can be explicitly disabled with
.IR hide .
.TP
+ .IR crossmnt
+ This option is similar to
+ .I nohide
+ but it makes it possible for clients to move from the filesystem marked
+ with crossmnt to exported filesystems mounted on it. Thus when a child
+ filesystem "B" is mounted on a parent "A", setting crossmnt on "A" has
+ the same effect as setting "nohide" on B.
+ .TP
.IR no_subtree_check
This option disables subtree checking, which has mild security
implications, but can improve reliability in some circumstances.
'''in the password file at startup time. If it isn't found, a uid and gid
.I exportfs
chooses a uid and gid
-of -2 (i.e. 65534) for squashed access. These values can also be overridden by
+of 65534 for squashed access. These values can also be overridden by
the
.IR anonuid " and " anongid
options.
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/
- #include "config.h"
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
#include <signal.h>
#include <sys/stat.h>
{ "port", 1, 0, 'p' },
{ "no-tcp", 0, 0, 'n' },
{ "ha-callout", 1, 0, 'H' },
+ { "state-directory-path", 1, 0, 's' },
{ NULL, 0, 0, 0 }
};
xlog (L_FATAL, "Caught signal %d, un-registering and exiting.", sig);
}
+ static void
+ sig_hup (int sig)
+ {
+ /* don't exit on SIGHUP */
+ xlog (L_NOTICE, "Received SIGHUP... Ignoring.\n", sig);
+ return;
+ }
+
bool_t
mount_null_1_svc(struct svc_req *rqstp, void *argp, void *resp)
{
{
struct sockaddr_in *addr =
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
- xlog(L_NOTICE, "dump request from %s",
- inet_ntoa(addr->sin_addr));
- *res = mountlist_list();
+ if ((*res = mountlist_list()) == NULL)
+ xlog(L_WARNING, "dump request from %s failed.",
+ inet_ntoa(addr->sin_addr));
+
return 1;
}
{
struct sockaddr_in *addr =
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
- xlog(L_NOTICE, "export request from %s",
- inet_ntoa(addr->sin_addr));
- *resp = get_exportlist();
+
+ if ((*resp = get_exportlist()) == NULL)
+ xlog(L_WARNING, "export request from %s failed.",
+ inet_ntoa(addr->sin_addr));
+
return 1;
}
{
struct sockaddr_in *addr =
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
- xlog(L_NOTICE, "exportall request from %s",
- inet_ntoa(addr->sin_addr));
- *resp = get_exportlist();
+
+ if ((*resp = get_exportlist()) == NULL)
+ xlog(L_WARNING, "exportall request from %s failed.",
+ inet_ntoa(addr->sin_addr));
return 1;
}
bool_t
mount_mnt_3_svc(struct svc_req *rqstp, dirpath *path, mountres3 *res)
{
- static int flavors[] = { AUTH_NULL, AUTH_UNIX };
+ #define AUTH_GSS_KRB5 390003
+ #define AUTH_GSS_KRB5I 390004
+ #define AUTH_GSS_KRB5P 390005
+ static int flavors[] = { AUTH_NULL, AUTH_UNIX, AUTH_GSS_KRB5, AUTH_GSS_KRB5I, AUTH_GSS_KRB5P};
struct nfs_fh_len *fh;
xlog(D_CALL, "MNT3(%s) called", *path);
ok->fhandle.fhandle3_len = fh->fh_size;
ok->fhandle.fhandle3_val = fh->fh_handle;
- ok->auth_flavors.auth_flavors_len = 2;
+ ok->auth_flavors.auth_flavors_len
+ = sizeof(flavors)/sizeof(flavors[0]);
ok->auth_flavors.auth_flavors_val = flavors;
}
return 1;
xfree(c->gr_name);
xfree(c);
xfree (hp);
- if ((c = *cp) == NULL)
- break;
+ continue;
}
- else
- xfree (hp);
+ xfree (hp);
}
cp = &(c->gr_next);
}
main(int argc, char **argv)
{
char *export_file = _PATH_EXPORTS;
+ char *state_dir = NFS_STATEDIR;
int foreground = 0;
int port = 0;
int descriptors = 0;
case 'n':
_rpcfdtype = SOCK_DGRAM;
break;
+ case 's':
+ if ((state_dir = xstrdup(optarg)) == NULL) {
+ fprintf(stderr, "%s: xstrdup(%s) failed!\n",
+ argv[0], optarg);
+ exit(1);
+ }
+ break;
case 'V':
nfs_version |= 1 << (atoi (optarg) - 1);
break;
if (optind != argc || !(nfs_version & 0x7))
usage(argv [0], 1);
- if (chdir(NFS_STATEDIR)) {
+ if (chdir(state_dir)) {
fprintf(stderr, "%s: chdir(%s) failed: %s\n",
- argv [0], NFS_STATEDIR, strerror(errno));
+ argv [0], state_dir, strerror(errno));
exit(1);
}
sigaction(SIGCHLD, &sa, NULL);
/* Daemons should close all extra filehandles ... *before* RPC init. */
- if (!foreground) {
- int fd = sysconf (_SC_OPEN_MAX);
- while (--fd > 2)
- (void) close(fd);
- }
+ if (!foreground)
+ closeall(3);
new_cache = check_new_cache();
if (new_cache)
mount_dispatch, port);
sa.sa_handler = killer;
- sigaction(SIGHUP, &sa, NULL);
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
+ sa.sa_handler = sig_hup;
+ sigaction(SIGHUP, &sa, NULL);
auth_init(export_file);
" [-o num|--descriptors num] [-f exports-file|--exports-file=file]\n"
" [-p|--port port] [-V version|--nfs-version version]\n"
" [-N version|--no-nfs-version version] [-n|--no-tcp]\n"
-" [-H ha-callout-prog]\n", prog);
+" [-H ha-callout-prog] [-s|--state-directory-path path]\n", prog);
exit(n);
}
projects / nfs-utils.git / commitdiff