Currently, rpc.mountd's -s/--state-directory-path option doesn't really
do anything (rpc.mountd tests it via chdir() but that's all). These
patches implement the -s/--state-directory-path option so that
rpc.mountd's state files (the etab and rmtab) can be placed in a
location other than /var/lib/nfs... for example, /run/nfs.
To use /run/nfs, it's necessary to create a systemd-tmpfiles config
file, e.g.
# cat /usr/lib/tmpfiles.d/nfs.conf
#Type Path Mode UID GID Age Argument
d /run/nfs 0755 root root - -
f /run/nfs/etab 0644 root root - -
f /run/nfs/rmtab 0644 root root - -
and if selinux is in enforcing mode, the correct context would need to
be set on the directory (On Fedora, semanage barks at me if I use
/run/nfs... that's why I'm using /var/run/nfs here instead):
# semanage fcontext -a -t var_lib_nfs_t /var/run/nfs
Notes:
- I didn't actually implement the option (in either the command line or
the nfs.conf) for exportfs. Instead it reads rpc.mountd's setting from
the nfs.conf so that they're using the same value. Maybe it would be
better to add the option to exportfs too and emit a warning if exportfs
is using a different value than rpc.mountd (which would only be
detectable if mountd is using the nfs.conf).
- Since the contents of /run are volatile, moving the rmtab file there
would mean 'showmount -a' would only show NFSv3 mounts that have occurred
since the last boot. I'm not sure if that's a big deal or not. Looking
at the rmtab file on my main test server I see a lot of outdated
entries, so this might actually be preferable.
- Looking at rpc.mountd(8) it actually says 'Specify a directory in which
to place statd state information'... I'm not sure why mountd would care
where statd puts its state files. The point of these two patches was to
separate that out, so that all that's left on /var/lib/nfs is the stuff
used by rpc.statd/sm-notify/nfsdcltrack. I can either use a different
option or reword that sentence on the man page.
Scott Mayhew (2):
libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname()
mountd/exportfs: implement the -s/--state-directory-path option
support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++-
support/include/misc.h | 3 ++
support/include/nfslib.h | 17 +++++++
support/misc/Makefile.am | 2 +-
support/misc/file.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
support/nfs/cacheio.c | 4 +-
support/nfs/rmtab.c | 4 +-
support/nsm/file.c | 45 ++-----------------
utils/exportfs/exportfs.c | 13 ++++++
utils/mountd/auth.c | 8 ++--
utils/mountd/mountd.c | 31 ++++++++-----
utils/mountd/rmtab.c | 26 ++++++-----
utils/statd/Makefile.am | 1 +
13 files changed, 273 insertions(+), 73 deletions(-)
create mode 100644 support/misc/file.c
--
2.7.4
Signed-off-by: Scott Mayhew <[email protected]>
---
support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++++++++++++++--
support/include/nfslib.h | 17 ++++++++++
support/nfs/cacheio.c | 4 ++-
support/nfs/rmtab.c | 4 ++-
utils/exportfs/exportfs.c | 13 ++++++++
utils/mountd/auth.c | 8 +++--
utils/mountd/mountd.c | 31 +++++++++++-------
utils/mountd/rmtab.c | 26 ++++++++-------
8 files changed, 155 insertions(+), 30 deletions(-)
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 22cf539..a30c0b2 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -14,12 +14,20 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <libgen.h>
#include "nfslib.h"
#include "exportfs.h"
#include "xio.h"
#include "xlog.h"
#include "v4root.h"
+#include "misc.h"
+
+static char xtab_base_dirname[PATH_MAX] = NFS_STATEDIR;
+extern struct xtab_paths etab;
int v4root_needed;
static void cond_rename(char *newfile, char *oldfile);
@@ -65,7 +73,7 @@ xtab_read(char *xtab, char *lockfn, int is_export)
int
xtab_export_read(void)
{
- return xtab_read(_PATH_ETAB, _PATH_ETABLCK, 1);
+ return xtab_read(etab.xtab, etab.lockfn, 1);
}
/*
@@ -112,7 +120,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)
int
xtab_export_write()
{
- return xtab_write(_PATH_ETAB, _PATH_ETABTMP, _PATH_ETABLCK, 1);
+ return xtab_write(etab.xtab, etab.xtabtmp, etab.lockfn, 1);
}
/*
@@ -158,3 +166,73 @@ static void cond_rename(char *newfile, char *oldfile)
rename(newfile, oldfile);
return;
}
+
+/*
+ * Returns a dynamically allocated, '\0'-terminated buffer
+ * containing an appropriate pathname, or NULL if an error
+ * occurs. Caller must free the returned result with free(3).
+ */
+static char *
+xtab_make_pathname(const char *tabname)
+{
+ return generic_make_pathname(xtab_base_dirname, tabname);
+}
+
+/**
+ * xtab_setup_basedir - set up basedir
+ * @progname: C string containing name of program, for error messages
+ * @parentdir: C string containing pathname to on-disk state, or NULL
+ *
+ * This runs before logging is set up, so error messages are directed
+ * to stderr.
+ *
+ * Returns true and sets up our basedir, if @parentdir was valid
+ * and usable; otherwise false is returned.
+ */
+_Bool
+xtab_setup_basedir(const char *progname, const char *parentdir)
+{
+ return generic_setup_basedir(progname, parentdir, xtab_base_dirname);
+}
+
+int
+setup_xtab_path_names(const char *progname, const char *xtab,
+ const char *xtabtmp, const char *lockfn,
+ struct xtab_paths *paths)
+{
+ paths->xtab = xtab_make_pathname(xtab);
+ if (!paths->xtab) {
+ fprintf(stderr, "%s: xtab_make_pathname(%s) failed\n",
+ progname, xtab);
+ goto out_err;
+ }
+ paths->xtabtmp = xtab_make_pathname(xtabtmp);
+ if (!paths->xtabtmp) {
+ fprintf(stderr, "%s: xtab_make_pathname(%s) failed\n",
+ progname, xtabtmp);
+ goto out_free_xtab;
+ }
+ paths->lockfn = xtab_make_pathname(lockfn);
+ if (!paths->lockfn) {
+ fprintf(stderr, "%s: xtab_make_pathname(%s) failed\n",
+ progname, lockfn);
+ goto out_free_xtabtmp;
+ }
+ return 1;
+
+out_free_xtabtmp:
+ free(paths->xtabtmp);
+out_free_xtab:
+ free(paths->xtab);
+out_err:
+ return 0;
+
+}
+
+void
+free_xtab_path_names(struct xtab_paths *paths)
+{
+ free(paths->xtab);
+ free(paths->xtabtmp);
+ free(paths->lockfn);
+}
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 1498977..1c462ec 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -58,6 +58,19 @@
#define _PATH_PROC_EXPORTS_ALT "/proc/fs/nfsd/exports"
#endif
+#define ETAB "etab"
+#define ETABTMP "etab.tmp"
+#define ETABLCK ".etab.lock"
+#define RMTAB "rmtab"
+#define RMTABTMP "rmtab.tmp"
+#define RMTABLCK ".rmtab.lock"
+
+struct xtab_paths {
+ char *xtab;
+ char *xtabtmp;
+ char *lockfn;
+};
+
/* Maximum number of security flavors on an export: */
#define SECFLAVOR_COUNT 8
@@ -120,6 +133,10 @@ void fputrmtabent(FILE *fp, struct rmtabent *xep, long *pos);
void fendrmtabent(FILE *fp);
void frewindrmtabent(FILE *fp);
+_Bool xtab_setup_basedir(const char *, const char *);
+int setup_xtab_path_names(const char *, const char *, const char *, const char *, struct xtab_paths *);
+void free_xtab_path_names(struct xtab_paths *);
+
/* mydaemon */
void daemon_init(bool fg);
void daemon_ready(void);
diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
index e5e2579..64983b1 100644
--- a/support/nfs/cacheio.c
+++ b/support/nfs/cacheio.c
@@ -27,6 +27,8 @@
#include <time.h>
#include <errno.h>
+extern struct xtab_paths etab;
+
void qword_add(char **bpp, int *lp, char *str)
{
char *bp = *bpp;
@@ -228,7 +230,7 @@ cache_flush(int force)
};
now = time(0);
if (force ||
- stat(_PATH_ETAB, &stb) != 0 ||
+ stat(etab.xtab, &stb) != 0 ||
stb.st_mtime > now)
stb.st_mtime = time(0);
diff --git a/support/nfs/rmtab.c b/support/nfs/rmtab.c
index 59dfbdf..d810f50 100644
--- a/support/nfs/rmtab.c
+++ b/support/nfs/rmtab.c
@@ -33,12 +33,14 @@
static FILE *rmfp = NULL;
+extern struct xtab_paths rmtab;
+
int
setrmtabent(char *type)
{
if (rmfp)
fclose(rmfp);
- rmfp = fsetrmtabent(_PATH_RMTAB, type);
+ rmfp = fsetrmtabent(rmtab.xtab, type);
return (rmfp != NULL);
}
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 61dddfb..18031a1 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -52,6 +52,8 @@ static const char *lockfile = EXP_LOCKFILE;
static int _lockfd = -1;
char *conf_path = NFS_CONFFILE;
+struct xtab_paths etab;
+
/*
* If we aren't careful, changes made by exportfs can be lost
* when multiple exports process run at once:
@@ -95,6 +97,7 @@ main(int argc, char **argv)
int f_ignore = 0;
int i, c;
int force_flush = 0;
+ char *s;
if ((progname = strrchr(argv[0], '/')) != NULL)
progname++;
@@ -108,6 +111,11 @@ main(int argc, char **argv)
conf_init();
xlog_from_conffile("exportfs");
+ /* NOTE: following uses "mountd" section of nfs.conf !!!! */
+ s = conf_get_str("mountd", "state-directory-path");
+ if (s && !xtab_setup_basedir(argv[0], s))
+ exit(1);
+
while ((c = getopt(argc, argv, "ad:fhio:ruvs")) != EOF) {
switch(c) {
case 'a':
@@ -159,13 +167,17 @@ main(int argc, char **argv)
xlog(L_ERROR, "-r and -u are incompatible");
return 1;
}
+ if (!setup_xtab_path_names(progname, ETAB, ETABTMP, ETABLCK, &etab))
+ return 1;
if (optind == argc && ! f_all) {
if (force_flush) {
cache_flush(1);
+ free_xtab_path_names(&etab);
return 0;
} else {
xtab_export_read();
dump(f_verbose, f_export_format);
+ free_xtab_path_names(&etab);
return 0;
}
}
@@ -206,6 +218,7 @@ main(int argc, char **argv)
}
xtab_export_write();
cache_flush(force_flush);
+ free_xtab_path_names(&etab);
return export_errno;
}
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index d065830..4fda0ba 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -41,6 +41,8 @@ static nfs_client my_client;
extern int use_ipaddr;
+extern struct xtab_paths etab;
+
void
auth_init(void)
{
@@ -84,10 +86,10 @@ auth_reload()
static unsigned int counter;
int fd;
- if ((fd = open(_PATH_ETAB, O_RDONLY)) < 0) {
- xlog(L_FATAL, "couldn't open %s", _PATH_ETAB);
+ if ((fd = open(etab.xtab, O_RDONLY)) < 0) {
+ xlog(L_FATAL, "couldn't open %s", etab.xtab);
} else if (fstat(fd, &stb) < 0) {
- xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB);
+ xlog(L_FATAL, "couldn't stat %s", etab.xtab);
close(fd);
} else if (last_fd != -1 && stb.st_ino == last_inode) {
/* We opened the etab file before, and its inode
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 61699e6..c841aad 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -29,6 +29,7 @@
#include "mountd.h"
#include "rpcmisc.h"
#include "pseudoflavors.h"
+#include "nfslib.h"
extern void my_svc_run(void);
@@ -40,6 +41,9 @@ int reverse_resolve = 0;
int manage_gids;
int use_ipaddr = -1;
+struct xtab_paths etab;
+struct xtab_paths rmtab;
+
char *conf_path = NFS_CONFFILE;
/* PRC: a high-availability callout program can be specified with -H
@@ -110,8 +114,8 @@ unregister_services (void)
static void
cleanup_lockfiles (void)
{
- unlink(_PATH_ETABLCK);
- unlink(_PATH_RMTABLCK);
+ unlink(etab.lockfn);
+ unlink(rmtab.lockfn);
}
/* Wait for all worker child processes to exit and reap them */
@@ -181,6 +185,8 @@ fork_workers(void)
wait_for_workers();
unregister_services();
cleanup_lockfiles();
+ free_xtab_path_names(&etab);
+ free_xtab_path_names(&rmtab);
xlog(L_NOTICE, "mountd: no more workers, exiting\n");
exit(0);
}
@@ -198,6 +204,8 @@ killer (int sig)
wait_for_workers();
}
cleanup_lockfiles();
+ free_xtab_path_names(&etab);
+ free_xtab_path_names(&rmtab);
xlog (L_NOTICE, "Caught signal %d, un-registering and exiting.", sig);
exit(0);
}
@@ -656,7 +664,6 @@ get_exportlist(void)
int
main(int argc, char **argv)
{
- char *state_dir = NFS_STATEDIR;
char *progname;
char *s;
unsigned int listeners = 0;
@@ -684,8 +691,8 @@ main(int argc, char **argv)
ha_callout_prog = conf_get_str("mountd", "ha-callout");
s = conf_get_str("mountd", "state-directory-path");
- if (s)
- state_dir = s;
+ if (s && !xtab_setup_basedir(argv[0], s))
+ exit(1);
/* NOTE: following uses "nfsd" section of nfs.conf !!!! */
if (conf_get_bool("nfsd", "udp", NFSCTL_UDPISSET(_rpcprotobits)))
@@ -758,7 +765,8 @@ main(int argc, char **argv)
reverse_resolve = 1;
break;
case 's':
- state_dir = xstrdup(optarg);
+ if (!xtab_setup_basedir(argv[0], optarg))
+ exit(1);
break;
case 't':
num_threads = atoi (optarg);
@@ -790,11 +798,10 @@ main(int argc, char **argv)
fprintf(stderr, "%s: No protocol versions specified!\n", progname);
usage(progname, 1);
}
- if (chdir(state_dir)) {
- fprintf(stderr, "%s: chdir(%s) failed: %s\n",
- progname, state_dir, strerror(errno));
- exit(1);
- }
+ if (!setup_xtab_path_names(progname, ETAB, ETABTMP, ETABLCK, &etab))
+ return 1;
+ if (!setup_xtab_path_names(progname, RMTAB, RMTABTMP, RMTABLCK, &rmtab))
+ return 1;
if (getrlimit (RLIMIT_NOFILE, &rlim) != 0)
fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
@@ -888,6 +895,8 @@ main(int argc, char **argv)
xlog(L_ERROR, "RPC service loop terminated unexpectedly. Exiting...\n");
unregister_services();
+ free_xtab_path_names(&etab);
+ free_xtab_path_names(&rmtab);
exit(1);
}
diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index 527377f..1f38031 100644
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -28,6 +28,8 @@
extern int reverse_resolve;
+extern struct xtab_paths rmtab;
+
/* If new path is a link do not destroy it but place the
* file where the link points.
*/
@@ -59,7 +61,7 @@ mountlist_add(char *host, const char *path)
int lockid;
long pos;
- if ((lockid = xflock(_PATH_RMTABLCK, "a")) < 0)
+ if ((lockid = xflock(rmtab.lockfn, "a")) < 0)
return;
setrmtabent("r+");
while ((rep = getrmtabent(1, &pos)) != NULL) {
@@ -99,13 +101,13 @@ mountlist_del(char *hname, const char *path)
int lockid;
int match;
- if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
+ if ((lockid = xflock(rmtab.lockfn, "w")) < 0)
return;
if (!setrmtabent("r")) {
xfunlock(lockid);
return;
}
- if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {
+ if (!(fp = fsetrmtabent(rmtab.xtabtmp, "w"))) {
endrmtabent();
xfunlock(lockid);
return;
@@ -121,9 +123,9 @@ mountlist_del(char *hname, const char *path)
if (!match || rep->r_count)
fputrmtabent(fp, rep, NULL);
}
- if (slink_safe_rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
+ if (slink_safe_rename(rmtab.xtabtmp, rmtab.xtab) < 0) {
xlog(L_ERROR, "couldn't rename %s to %s",
- _PATH_RMTABTMP, _PATH_RMTAB);
+ rmtab.xtabtmp, rmtab.xtab);
}
endrmtabent(); /* close & unlink */
fendrmtabent(fp);
@@ -138,7 +140,7 @@ mountlist_del_all(const struct sockaddr *sap)
FILE *fp;
int lockid;
- if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
+ if ((lockid = xflock(rmtab.lockfn, "w")) < 0)
return;
hostname = host_canonname(sap);
if (hostname == NULL) {
@@ -151,7 +153,7 @@ mountlist_del_all(const struct sockaddr *sap)
if (!setrmtabent("r"))
goto out_free;
- if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w")))
+ if (!(fp = fsetrmtabent(rmtab.xtabtmp, "w")))
goto out_close;
while ((rep = getrmtabent(1, NULL)) != NULL) {
@@ -160,9 +162,9 @@ mountlist_del_all(const struct sockaddr *sap)
continue;
fputrmtabent(fp, rep, NULL);
}
- if (slink_safe_rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
+ if (slink_safe_rename(rmtab.xtabtmp, rmtab.xtab) < 0) {
xlog(L_ERROR, "couldn't rename %s to %s",
- _PATH_RMTABTMP, _PATH_RMTAB);
+ rmtab.xtabtmp, rmtab.xtab);
}
fendrmtabent(fp);
out_close:
@@ -195,11 +197,11 @@ mountlist_list(void)
struct stat stb;
int lockid;
- if ((lockid = xflock(_PATH_RMTABLCK, "r")) < 0)
+ if ((lockid = xflock(rmtab.lockfn, "r")) < 0)
return NULL;
- if (stat(_PATH_RMTAB, &stb) < 0) {
+ if (stat(rmtab.xtab, &stb) < 0) {
xlog(L_ERROR, "can't stat %s: %s",
- _PATH_RMTAB, strerror(errno));
+ rmtab.xtab, strerror(errno));
xfunlock(lockid);
return NULL;
}
--
2.7.4
Move the logic in nsm_setup_pathnames() and nsm_make_pathname() to
similar generic functions in libmisc.a so that the exportfs and
rpc.mountd programs can make use of them later.
Signed-off-by: Scott Mayhew <[email protected]>
---
support/include/misc.h | 3 ++
support/misc/Makefile.am | 2 +-
support/misc/file.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++
support/nsm/file.c | 45 ++-----------------
utils/statd/Makefile.am | 1 +
5 files changed, 118 insertions(+), 43 deletions(-)
create mode 100644 support/misc/file.c
diff --git a/support/include/misc.h b/support/include/misc.h
index eedc1fe..6f9b47c 100644
--- a/support/include/misc.h
+++ b/support/include/misc.h
@@ -15,6 +15,9 @@
int randomkey(unsigned char *keyout, int len);
int weakrandomkey(unsigned char *keyout, int len);
+char *generic_make_pathname(const char *, const char *);
+_Bool generic_setup_basedir(const char *, const char *, char *);
+
extern int is_mountpoint(char *path);
/* size of the file pointer buffers for rpc procfs files */
diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am
index 1048580..8936b0d 100644
--- a/support/misc/Makefile.am
+++ b/support/misc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libmisc.a
-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c
+libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c
MAINTAINERCLEANFILES = Makefile.in
diff --git a/support/misc/file.c b/support/misc/file.c
new file mode 100644
index 0000000..ee6d264
--- /dev/null
+++ b/support/misc/file.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2009 Oracle. All rights reserved.
+ * Copyright 2017 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of nfs-utils.
+ *
+ * nfs-utils is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * nfs-utils is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with nfs-utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/stat.h>
+
+#include <string.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <errno.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "xlog.h"
+#include "misc.h"
+
+static _Bool
+error_check(const int len, const size_t buflen)
+{
+ return (len < 0) || ((size_t)len >= buflen);
+}
+
+/*
+ * Returns a dynamically allocated, '\0'-terminated buffer
+ * containing an appropriate pathname, or NULL if an error
+ * occurs. Caller must free the returned result with free(3).
+ */
+__attribute__((__malloc__))
+char *
+generic_make_pathname(const char *base, const char *leaf)
+{
+ size_t size;
+ char *path;
+ int len;
+
+ size = strlen(base) + strlen(leaf) + 2;
+ if (size > PATH_MAX)
+ return NULL;
+
+ path = malloc(size);
+ if (path == NULL)
+ return NULL;
+
+ len = snprintf(path, size, "%s/%s", base, leaf);
+ if (error_check(len, size)) {
+ free(path);
+ return NULL;
+ }
+
+ return path;
+}
+
+
+/**
+ * generic_setup_basedir - set up basedir
+ * @progname: C string containing name of program, for error messages
+ * @parentdir: C string containing pathname to on-disk state, or NULL
+ * @base: C string used to contain the basedir that is set up
+ *
+ * This runs before logging is set up, so error messages are directed
+ * to stderr.
+ *
+ * Returns true and sets up our basedir, if @parentdir was valid
+ * and usable; otherwise false is returned.
+ */
+_Bool
+generic_setup_basedir(const char *progname, const char *parentdir, char *base)
+{
+ static char buf[PATH_MAX];
+ struct stat st;
+ char *path;
+
+ /* First: test length of name and whether it exists */
+ if (lstat(parentdir, &st) == -1) {
+ (void)fprintf(stderr, "%s: Failed to stat %s: %s",
+ progname, parentdir, strerror(errno));
+ return false;
+ }
+
+ /* Ensure we have a clean directory pathname */
+ strncpy(buf, parentdir, sizeof(buf));
+ path = dirname(buf);
+ if (*path == '.') {
+ (void)fprintf(stderr, "%s: Unusable directory %s",
+ progname, parentdir);
+ return false;
+ }
+
+ xlog(D_CALL, "Using %s as the state directory", parentdir);
+ strncpy(base, parentdir, strlen(base));
+ base[strlen(parentdir)] = '\0';
+ return true;
+}
diff --git a/support/nsm/file.c b/support/nsm/file.c
index aafa755..865be54 100644
--- a/support/nsm/file.c
+++ b/support/nsm/file.c
@@ -88,6 +88,7 @@
#include "xlog.h"
#include "nsm.h"
+#include "misc.h"
#define RPCARGSLEN (4 * (8 + 1))
#define LINELEN (RPCARGSLEN + SM_PRIV_SIZE * 2 + 1)
@@ -170,25 +171,7 @@ __attribute__((__malloc__))
static char *
nsm_make_pathname(const char *directory)
{
- size_t size;
- char *path;
- int len;
-
- size = strlen(nsm_base_dirname) + strlen(directory) + 2;
- if (size > PATH_MAX)
- return NULL;
-
- path = malloc(size);
- if (path == NULL)
- return NULL;
-
- len = snprintf(path, size, "%s/%s", nsm_base_dirname, directory);
- if (error_check(len, size)) {
- free(path);
- return NULL;
- }
-
- return path;
+ return generic_make_pathname(nsm_base_dirname, directory);
}
/*
@@ -293,29 +276,7 @@ out:
_Bool
nsm_setup_pathnames(const char *progname, const char *parentdir)
{
- static char buf[PATH_MAX];
- struct stat st;
- char *path;
-
- /* First: test length of name and whether it exists */
- if (lstat(parentdir, &st) == -1) {
- (void)fprintf(stderr, "%s: Failed to stat %s: %s",
- progname, parentdir, strerror(errno));
- return false;
- }
-
- /* Ensure we have a clean directory pathname */
- strncpy(buf, parentdir, sizeof(buf));
- path = dirname(buf);
- if (*path == '.') {
- (void)fprintf(stderr, "%s: Unusable directory %s",
- progname, parentdir);
- return false;
- }
-
- xlog(D_CALL, "Using %s as the state directory", parentdir);
- strncpy(nsm_base_dirname, parentdir, sizeof(nsm_base_dirname));
- return true;
+ return generic_setup_basedir(progname, parentdir, nsm_base_dirname);
}
/**
diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am
index 152b680..ea32075 100644
--- a/utils/statd/Makefile.am
+++ b/utils/statd/Makefile.am
@@ -18,6 +18,7 @@ statd_LDADD = ../../support/nsm/libnsm.a \
$(LIBWRAP) $(LIBNSL) $(LIBCAP) $(LIBTIRPC)
sm_notify_LDADD = ../../support/nsm/libnsm.a \
../../support/nfs/libnfs.a \
+ ../../support/misc/libmisc.a \
$(LIBNSL) $(LIBCAP) $(LIBTIRPC)
EXTRA_DIST = sim_sm_inter.x $(man8_MANS) simulate.c
--
2.7.4
On Mon, Jan 30 2017, Scott Mayhew wrote:
> Currently, rpc.mountd's -s/--state-directory-path option doesn't really
> do anything (rpc.mountd tests it via chdir() but that's all). These
> patches implement the -s/--state-directory-path option so that
> rpc.mountd's state files (the etab and rmtab) can be placed in a
> location other than /var/lib/nfs... for example, /run/nfs.
>
> To use /run/nfs, it's necessary to create a systemd-tmpfiles config
> file, e.g.
>
> # cat /usr/lib/tmpfiles.d/nfs.conf
> #Type Path Mode UID GID Age Argument
> d /run/nfs 0755 root root - -
> f /run/nfs/etab 0644 root root - -
> f /run/nfs/rmtab 0644 root root - -
>
> and if selinux is in enforcing mode, the correct context would need to
> be set on the directory (On Fedora, semanage barks at me if I use
> /run/nfs... that's why I'm using /var/run/nfs here instead):
> # semanage fcontext -a -t var_lib_nfs_t /var/run/nfs
Hi Scott,
thanks for these - I think this is a good improvement.
I'm not very fond of the term "xtab" used through.
Presumably the intention is that the code is used for "rmtab" and
"etab", so "xtab" matches both, where "x" is the unknown.
Unfortunately we used to have an "xtab" file, and I keep thinking
of that when I see "xtab".
Maybe "state" ??? or leave it as it is, and I'll get over it.
>
> Notes:
>
> - I didn't actually implement the option (in either the command line or
> the nfs.conf) for exportfs. Instead it reads rpc.mountd's setting from
> the nfs.conf so that they're using the same value. Maybe it would be
> better to add the option to exportfs too and emit a warning if exportfs
> is using a different value than rpc.mountd (which would only be
> detectable if mountd is using the nfs.conf).
I like your current solution best.
> - Since the contents of /run are volatile, moving the rmtab file there
> would mean 'showmount -a' would only show NFSv3 mounts that have occurred
> since the last boot. I'm not sure if that's a big deal or not. Looking
> at the rmtab file on my main test server I see a lot of outdated
> entries, so this might actually be preferable.
I'd be fairly happy to discard rmtab completely. It is, at best, a vague
hint and is, as you observed, often inaccurate.
> - Looking at rpc.mountd(8) it actually says 'Specify a directory in which
> to place statd state information'... I'm not sure why mountd would care
> where statd puts its state files. The point of these two patches was to
> separate that out, so that all that's left on /var/lib/nfs is the stuff
> used by rpc.statd/sm-notify/nfsdcltrack. I can either use a different
> option or reword that sentence on the man page.
I think it would be best to reword the man page. As you say, mountd
doesn't care about statd state.
Thanks,
NeilBrown
>
>
> Scott Mayhew (2):
> libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname()
> mountd/exportfs: implement the -s/--state-directory-path option
>
> support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++-
> support/include/misc.h | 3 ++
> support/include/nfslib.h | 17 +++++++
> support/misc/Makefile.am | 2 +-
> support/misc/file.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
> support/nfs/cacheio.c | 4 +-
> support/nfs/rmtab.c | 4 +-
> support/nsm/file.c | 45 ++-----------------
> utils/exportfs/exportfs.c | 13 ++++++
> utils/mountd/auth.c | 8 ++--
> utils/mountd/mountd.c | 31 ++++++++-----
> utils/mountd/rmtab.c | 26 ++++++-----
> utils/statd/Makefile.am | 1 +
> 13 files changed, 273 insertions(+), 73 deletions(-)
> create mode 100644 support/misc/file.c
>
> --
> 2.7.4
On Tue, 31 Jan 2017, NeilBrown wrote:
> On Mon, Jan 30 2017, Scott Mayhew wrote:
>
> > Currently, rpc.mountd's -s/--state-directory-path option doesn't really
> > do anything (rpc.mountd tests it via chdir() but that's all). These
> > patches implement the -s/--state-directory-path option so that
> > rpc.mountd's state files (the etab and rmtab) can be placed in a
> > location other than /var/lib/nfs... for example, /run/nfs.
> >
> > To use /run/nfs, it's necessary to create a systemd-tmpfiles config
> > file, e.g.
> >
> > # cat /usr/lib/tmpfiles.d/nfs.conf
> > #Type Path Mode UID GID Age Argument
> > d /run/nfs 0755 root root - -
> > f /run/nfs/etab 0644 root root - -
> > f /run/nfs/rmtab 0644 root root - -
> >
> > and if selinux is in enforcing mode, the correct context would need to
> > be set on the directory (On Fedora, semanage barks at me if I use
> > /run/nfs... that's why I'm using /var/run/nfs here instead):
> > # semanage fcontext -a -t var_lib_nfs_t /var/run/nfs
>
> Hi Scott,
> thanks for these - I think this is a good improvement.
>
> I'm not very fond of the term "xtab" used through.
> Presumably the intention is that the code is used for "rmtab" and
> "etab", so "xtab" matches both, where "x" is the unknown.
Yep, that was the idea.
> Unfortunately we used to have an "xtab" file, and I keep thinking
> of that when I see "xtab".
> Maybe "state" ??? or leave it as it is, and I'll get over it.
I'll go ahead and change it.
>
> >
> > Notes:
> >
> > - I didn't actually implement the option (in either the command line or
> > the nfs.conf) for exportfs. Instead it reads rpc.mountd's setting from
> > the nfs.conf so that they're using the same value. Maybe it would be
> > better to add the option to exportfs too and emit a warning if exportfs
> > is using a different value than rpc.mountd (which would only be
> > detectable if mountd is using the nfs.conf).
>
> I like your current solution best.
>
> > - Since the contents of /run are volatile, moving the rmtab file there
> > would mean 'showmount -a' would only show NFSv3 mounts that have occurred
> > since the last boot. I'm not sure if that's a big deal or not. Looking
> > at the rmtab file on my main test server I see a lot of outdated
> > entries, so this might actually be preferable.
>
> I'd be fairly happy to discard rmtab completely.
I'll do that in a future patch if nobody objects.
> It is, at best, a vague
> hint and is, as you observed, often inaccurate.
>
> > - Looking at rpc.mountd(8) it actually says 'Specify a directory in which
> > to place statd state information'... I'm not sure why mountd would care
> > where statd puts its state files. The point of these two patches was to
> > separate that out, so that all that's left on /var/lib/nfs is the stuff
> > used by rpc.statd/sm-notify/nfsdcltrack. I can either use a different
> > option or reword that sentence on the man page.
>
> I think it would be best to reword the man page. As you say, mountd
> doesn't care about statd state.
Will do.
Thanks for looking!
-Scott
>
> Thanks,
> NeilBrown
>
> >
> >
> > Scott Mayhew (2):
> > libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname()
> > mountd/exportfs: implement the -s/--state-directory-path option
> >
> > support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++-
> > support/include/misc.h | 3 ++
> > support/include/nfslib.h | 17 +++++++
> > support/misc/Makefile.am | 2 +-
> > support/misc/file.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
> > support/nfs/cacheio.c | 4 +-
> > support/nfs/rmtab.c | 4 +-
> > support/nsm/file.c | 45 ++-----------------
> > utils/exportfs/exportfs.c | 13 ++++++
> > utils/mountd/auth.c | 8 ++--
> > utils/mountd/mountd.c | 31 ++++++++-----
> > utils/mountd/rmtab.c | 26 ++++++-----
> > utils/statd/Makefile.am | 1 +
> > 13 files changed, 273 insertions(+), 73 deletions(-)
> > create mode 100644 support/misc/file.c
> >
> > --
> > 2.7.4