diff -up nfs-utils-1.3.0/configure.ac.orig nfs-utils-1.3.0/configure.ac

--- nfs-utils-1.3.0/configure.ac.orig	2017-03-28 13:43:36.000000000 -0400

+++ nfs-utils-1.3.0/configure.ac	2017-03-28 13:43:53.000000000 -0400

@@ -23,6 +23,12 @@ AC_ARG_WITH(statedir,

 	statedir=$withval,

 	statedir=/var/lib/nfs)

 	AC_SUBST(statedir)

+AC_ARG_WITH(nfsconfig,

+	[AC_HELP_STRING([--with-nfsconfig=/config/file],

+			[use general config file /config/file @<:@default=/etc/nfs.conf@:>@])],

+	nfsconfig=$withval,

+	nfsconfig=/etc/nfs.conf)

+	AC_SUBST(nfsconfig)

 AC_ARG_WITH(statdpath,

 	[AC_HELP_STRING([--with-statdpath=/foo],

 			[define the statd state dir as /foo instead of the NFS statedir @<:@default=/var/lib/nfs@:>@])],

@@ -442,6 +448,7 @@ dnl Export some path names to config.h

 dnl *************************************************************

 AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir", [This defines the location of the NFS state files. Warning: this must match definitions in config.mk!])

 AC_DEFINE_UNQUOTED(NSM_DEFAULT_STATEDIR, "$statdpath", [Define this to the pathname where statd keeps its state file])

+AC_DEFINE_UNQUOTED(NFS_CONFFILE, "$nfsconfig", [This defines the location of NFS daemon config file])

 if test "x$cross_compiling" = "xno"; then

 	CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}

diff -up nfs-utils-1.3.0/support/include/conffile.h.orig nfs-utils-1.3.0/support/include/conffile.h

--- nfs-utils-1.3.0/support/include/conffile.h.orig	2014-03-25 11:12:07.000000000 -0400

+++ nfs-utils-1.3.0/support/include/conffile.h	2017-03-28 13:43:53.000000000 -0400

@@ -35,6 +35,8 @@

 #include <sys/queue.h>

 #include <ctype.h>

+#include <stdint.h>

+#include <stdbool.h>

 struct conf_list_node {

 	TAILQ_ENTRY(conf_list_node) link;

@@ -56,6 +58,7 @@ extern struct sockaddr *conf_get_address

 extern struct conf_list *conf_get_list(char *, char *);

 extern struct conf_list *conf_get_tag_list(char *, char *);

 extern int      conf_get_num(char *, char *, int);

+extern _Bool    conf_get_bool(char *, char *, _Bool);

 extern char    *conf_get_str(char *, char *);

 extern char    *conf_get_section(char *, char *, char *);

 extern void     conf_init(void);

diff -up nfs-utils-1.3.0/support/include/xlog.h.orig nfs-utils-1.3.0/support/include/xlog.h

--- nfs-utils-1.3.0/support/include/xlog.h.orig	2014-03-25 11:12:07.000000000 -0400

+++ nfs-utils-1.3.0/support/include/xlog.h	2017-03-28 13:43:53.000000000 -0400

@@ -41,6 +41,7 @@ void			xlog_stderr(int on);

 void			xlog_syslog(int on);

 void			xlog_config(int fac, int on);

 void			xlog_sconfig(char *, int on);

+void			xlog_from_conffile(char *);

 int			xlog_enabled(int fac);

 void			xlog(int fac, const char *fmt, ...);

 void			xlog_warn(const char *fmt, ...);

diff -up nfs-utils-1.3.0/support/nfs/conffile.c.orig nfs-utils-1.3.0/support/nfs/conffile.c

--- nfs-utils-1.3.0/support/nfs/conffile.c.orig	2014-03-25 11:12:07.000000000 -0400

+++ nfs-utils-1.3.0/support/nfs/conffile.c	2017-03-28 13:43:53.000000000 -0400

@@ -52,6 +52,7 @@

 #pragma GCC visibility push(hidden)

 static void conf_load_defaults(void);

+static int conf_load(int trans, char *path);

 static int conf_set(int , char *, char *, char *, 

 	char *, int , int );

@@ -107,8 +108,6 @@ struct conf_binding {

 char *conf_path;

 LIST_HEAD (conf_bindings, conf_binding) conf_bindings[256];

-static char *conf_addr;

-

 static __inline__ u_int8_t

 conf_hash(char *s)

 {

@@ -213,7 +212,7 @@ static void

 conf_parse_line(int trans, char *line, size_t sz)

 {

 	char *val, *ptr;

-	size_t i, valsize;

+	size_t i;

 	size_t j;

 	static char *section = 0;

 	static char *arg = 0;

@@ -300,18 +299,32 @@ conf_parse_line(int trans, char *line, s

 			}

 			line[strcspn (line, " \t=")] = '\0';

 			val = line + i + 1 + strspn (line + i + 1, " \t");

-			valsize = 0;

-			while (val[valsize++]);

-			/* Skip trailing spaces and comments */

-			for (j = 0; j < valsize; j++) {

-				if (val[j] == '#' || val[j] == ';' || isspace(val[j])) {

-					val[j] = '\0';

-					break;

+			if (val[0] == '"') {

+				val ++;

+				j = strcspn(val, "\"");

+				val[j] = 0;

+			} else if (val[0] == '\'') {

+				val ++;

+				j = strcspn(val, "'");

+				val[j] = 0;

+			} else {

+				/* Skip trailing spaces and comments */

+				for (j = 0; val[j]; j++) {

+					if ((val[j] == '#' || val[j] == ';')

+					    && (j == 0 || isspace(val[j-1]))) {

+						val[j] = '\0';

+						break;

+					}

 				}

+				while (j && isspace(val[j-1]))

+					val[--j] = '\0';

 			}

-			/* XXX Perhaps should we not ignore errors?  */

-			conf_set(trans, section, arg, line, val, 0, 0);

+			if (strcasecmp(line, "include") == 0)

+				conf_load(trans, val);

+			else

+				/* XXX Perhaps should we not ignore errors?  */

+				conf_set(trans, section, arg, line, val, 0, 0);

 			return;

 		}

 	}

@@ -368,23 +381,18 @@ conf_init (void)

 	conf_reinit();

 }

-/* Open the config file and map it into our address space, then parse it.  */

-void

-conf_reinit(void)

+static int

+conf_load(int trans, char *path)

 {

-	struct conf_binding *cb = 0;

-	int fd, trans;

-	unsigned int i;

-	size_t sz;

-	char *new_conf_addr = 0;

 	struct stat sb;

+	if ((stat (path, &sb) == 0) || (errno != ENOENT)) {

+		char *new_conf_addr;

+		size_t sz = sb.st_size;

+		int fd = open (path, O_RDONLY, 0);

-	if ((stat (conf_path, &sb) == 0) || (errno != ENOENT)) {

-		sz = sb.st_size;

-		fd = open (conf_path, O_RDONLY, 0);

 		if (fd == -1) {

-			xlog_warn("conf_reinit: open (\"%s\", O_RDONLY) failed", conf_path);

-			return;

+			xlog_warn("conf_reinit: open (\"%s\", O_RDONLY) failed", path);

+			return -1;

 		}

 		new_conf_addr = malloc(sz);

@@ -396,39 +404,46 @@ conf_reinit(void)

 		/* XXX I assume short reads won't happen here.  */

 		if (read (fd, new_conf_addr, sz) != (int)sz) {

 			xlog_warn("conf_reinit: read (%d, %p, %lu) failed",

-   				fd, new_conf_addr, (unsigned long)sz);

+				fd, new_conf_addr, (unsigned long)sz);

 			goto fail;

 		}

 		close(fd);

-		trans = conf_begin();

 		/* XXX Should we not care about errors and rollback?  */

 		conf_parse(trans, new_conf_addr, sz);

+		free(new_conf_addr);

+		return 0;

+	fail:

+		close(fd);

+		free(new_conf_addr);

 	}

-	else

-		trans = conf_begin();

+	return -1;

+}

+

+/* Open the config file and map it into our address space, then parse it.  */

+void

+conf_reinit(void)

+{

+	struct conf_binding *cb = 0;

+	int trans;

+	unsigned int i;

+

+	trans = conf_begin();

+	if (conf_load(trans, conf_path) < 0)

+		return;

 	/* Load default configuration values.  */

 	conf_load_defaults();

 	/* Free potential existing configuration.  */

-	if (conf_addr) {

-		for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {

-			cb = LIST_FIRST (&conf_bindings[i]);

-			for (; cb; cb = LIST_FIRST (&conf_bindings[i]))

-				conf_remove_now(cb->section, cb->tag);

-		}

-		free (conf_addr);

+	for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {

+		cb = LIST_FIRST (&conf_bindings[i]);

+		for (; cb; cb = LIST_FIRST (&conf_bindings[i]))

+			conf_remove_now(cb->section, cb->tag);

 	}

 	conf_end(trans, 1);

-	conf_addr = new_conf_addr;

 	return;

-

-fail:

-	if (new_conf_addr)

-		free(new_conf_addr);

-	close (fd);

 }

 /*

@@ -446,6 +461,38 @@ conf_get_num(char *section, char *tag, i

 	return def;

 }

+/*

+ * Return the Boolean value denoted by TAG in section SECTION, or DEF

+ * if that tags does not exist.

+ * FALSE is returned for case-insensitve comparisons with 0, f, false, n, no, off

+ * TRUE is returned for 1, t, true, y, yes, on

+ * A failure to match one of these results in DEF

+ */

+_Bool

+conf_get_bool(char *section, char *tag, _Bool def)

+{

+	char *value = conf_get_str(section, tag);

+

+	if (!value)

+		return def;

+	if (strcasecmp(value, "1") == 0 ||

+	    strcasecmp(value, "t") == 0 ||

+	    strcasecmp(value, "true") == 0 ||

+	    strcasecmp(value, "y") == 0 ||

+	    strcasecmp(value, "yes") == 0 ||

+	    strcasecmp(value, "on") == 0)

+		return true;

+

+	if (strcasecmp(value, "0") == 0 ||

+	    strcasecmp(value, "f") == 0 ||

+	    strcasecmp(value, "false") == 0 ||

+	    strcasecmp(value, "n") == 0 ||

+	    strcasecmp(value, "no") == 0 ||

+	    strcasecmp(value, "off") == 0)

+		return false;

+	return def;

+}

+

 /* Validate X according to the range denoted by TAG in section SECTION.  */

 int

 conf_match_num(char *section, char *tag, int x)

@@ -476,12 +523,24 @@ char *

 conf_get_str(char *section, char *tag)

 {

 	struct conf_binding *cb;

-

+retry:

 	cb = LIST_FIRST (&conf_bindings[conf_hash (section)]);

 	for (; cb; cb = LIST_NEXT (cb, link)) {

 		if (strcasecmp (section, cb->section) == 0

-				&& strcasecmp (tag, cb->tag) == 0)

+		    && strcasecmp (tag, cb->tag) == 0) {

+			if (cb->value[0] == '$') {

+				/* expand $name from [environment] section,

+				 * or from environment

+				 */

+				char *env = getenv(cb->value+1);

+				if (env && *env)

+					return env;

+				section = "environment";

+				tag = cb->value + 1;

+				goto retry;

+			}

 			return cb->value;

+		}

 	}

 	return 0;

 }

@@ -705,6 +764,8 @@ conf_set(int transaction, char *section,

 {

 	struct conf_trans *node;

+	if (!value || !*value)

+		return 0;

 	node = conf_trans_node(transaction, CONF_SET);

 	if (!node)

 		return 1;

diff -up nfs-utils-1.3.0/support/nfs/xlog.c.orig nfs-utils-1.3.0/support/nfs/xlog.c

--- nfs-utils-1.3.0/support/nfs/xlog.c.orig	2014-03-25 11:12:07.000000000 -0400

+++ nfs-utils-1.3.0/support/nfs/xlog.c	2017-03-28 13:43:53.000000000 -0400

@@ -29,6 +29,7 @@

 #include <syslog.h>

 #include <errno.h>

 #include "nfslib.h"

+#include "conffile.h"

 #undef	VERBOSE_PRINTF

@@ -125,6 +126,19 @@ xlog_sconfig(char *kind, int on)

 	xlog_config(tbl->df_fac, on);

 }

+void

+xlog_from_conffile(char *service)

+{

+	struct conf_list *kinds;

+	struct conf_list_node *n;

+

+	kinds = conf_get_list(service, "debug");

+	if (!kinds || !kinds->cnt)

+		return;

+	TAILQ_FOREACH(n, &(kinds->fields), link)

+		xlog_sconfig(n->field, 1);

+}

+

 int

 xlog_enabled(int fac)

 {

diff -up nfs-utils-1.3.0/systemd/Makefile.am.orig nfs-utils-1.3.0/systemd/Makefile.am

--- nfs-utils-1.3.0/systemd/Makefile.am.orig	2017-03-28 13:43:36.000000000 -0400

+++ nfs-utils-1.3.0/systemd/Makefile.am	2017-03-28 13:43:53.000000000 -0400

@@ -20,7 +20,9 @@ unit_files =  \

     proc-fs-nfsd.mount \

     var-lib-nfs-rpc_pipefs.mount

-EXTRA_DIST = $(unit_files)

+man5_MANS	= nfs.conf.man

+man7_MANS	= nfs.systemd.man

+EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)

 unit_dir = /usr/lib/systemd/system

diff -up nfs-utils-1.3.0/systemd/nfs.conf.man.orig nfs-utils-1.3.0/systemd/nfs.conf.man

--- nfs-utils-1.3.0/systemd/nfs.conf.man.orig	2017-03-28 13:43:53.000000000 -0400

+++ nfs-utils-1.3.0/systemd/nfs.conf.man	2017-03-28 13:43:53.000000000 -0400

@@ -0,0 +1,231 @@

+.TH NFS.CONF 5

+.SH NAME

+nfs.conf \- general configuration for NFS daemons and tools

+.SH SYNOPSIS

+.I /etc/nfs.conf

+.SH DESCRIPTION

+.PP

+This file contains site-specific configuration for various NFS daemons

+and other processes.  Most configuration can also be passed to

+processes via command line arguments, but it can be more convenient to

+have a central file.  In particular, this encourages consistent

+configuration across different processes.

+.PP

+When command line options are provided, they override values set in

+this file.  When this file does not specify a particular parameter,

+and no command line option is provided, each tool provides its own

+default values.

+.PP

+The file format supports multiple sections, each of which can contain

+multiple value assignments.  A section is introduced by a line

+containing the section name enclosed in square brackets, so

+.RS

+.B [global]

+.RE

+would introduce a section called

+.BR global .

+A value assignment is a single line that has the name of the value, an

+equals sign, and a setting for the value, so

+.RS

+.B threads = 4

+.RE

+would set the value named

+.B threads

+in the current section to

+.BR 4 .

+Leading and trailing spaces and tab

+are ignored, as are spaces and tabs surrounding the equals sign.

+Single and double quotes surrounding the assigned value are also

+removed.  If the resulting string is empty, the whole assignment

+is ignored.

+.PP

+Any line starting with

+.RB \*(lq # \*(rq

+or

+.RB \*(lq ; \*(rq

+is ignored, as is any blank line.

+.PP

+If the assigned value started with a

+.RB \*(lq $ \*(rq

+then the remainder is treated as a name and looked for in the section

+.B [environment]

+or in the processes environment (see

+.BR environ (7)).

+The value found is used for this value.

+.PP

+The value name

+.B include

+is special.  If a section contains

+.RS

+.B include = /some/file/name

+.RE

+then the named file will be read, and any value assignments found

+there-in will be added to the current section.  If the file contains

+section headers, then new sections will be created just as if the

+included file appeared in place of the

+.B include

+line.

+.PP

+Lookup of section and value names is case-insensitive.

+

+Where a Boolean value is expected, any of

+.BR true ,

+.BR t ,

+.BR yes ,

+.BR y ,

+.BR on ", or"

+.B 1

+can be used for "true", while

+.BR false ,

+.BR f ,

+.BR no ,

+.BR n ,

+.BR off ", or"

+.B 0

+can be used for "false".  Comparisons are case-insensitive.

+

+.SH SECTIONS

+The following sections are known to various programs, and can contain

+the given named values.  Most sections can also contain a

+.B debug

+value, which can be one or more from the list

+.BR general ,

+.BR call ,

+.BR auth ,

+.BR parse ,

+.BR all .

+When a list is given, the members should be comma-separated.

+.TP

+.B nfsdcltrack

+Recognized values:

+.BR storagedir .

+

+The

+.B nfsdcltrack

+program is run directly by the Linux kernel and there is no

+opportunity to provide command line arguments, so the configuration

+file is the only way to configure this program.  See

+.BR nfsdcltrack (8)

+for details.

+

+.TP

+.B nfsd

+Recognized values:

+.BR threads ,

+.BR host ,

+.BR port ,

+.BR grace-time ,

+.BR lease-time ,

+.BR udp ,

+.BR tcp ,

+.BR vers2 ,

+.BR vers3 ,

+.BR vers4 ,

+.BR vers4.0 ,

+.BR vers4.1 ,

+.BR vers4.2 ,

+.BR rdma .

+

+Version and protocol values are Boolean values as described above,

+and are also used by

+.BR rpc.mountd .

+Threads and the two times are integers.

+.B port

+and

+.B rdma

+are service names or numbers.  See

+.BR rpc.nfsd (8)

+for details.

+

+.TP

+.B mountd

+Recognized values:

+.BR manage-gids ,

+.BR descriptors ,

+.BR port ,

+.BR threads ,

+.BR reverse-lookup ,

+.BR state-directory-path ,

+.BR ha-callout .

+

+These, together with the protocol and version values in the

+.B [nfsd]

+section, are used to configure mountd.  See

+.BR rpc.mountd (8)

+for details.

+

+.TP

+.B statd

+Recognized values:

+.BR port ,

+.BR outgoing-port ,

+.BR name ,

+.BR state-directory-path ,

+.BR ha-callout .

+

+See

+.BR rpc.statd (8)

+for details.

+

+.TP

+.B lockd

+Recognized values:

+.B port

+and

+.BR udp-port .

+

+See

+.BR rpc.statd (8)

+for details.

+

+.TP

+.B sm-notify

+Recognized values:

+.BR retry-time ,

+.BR outgoing-port ", and"

+.BR outgoing-addr .

+

+See

+.BR sm-notify (8)

+for details.

+

+.TP

+.B gssd

+Recognized values:

+.BR use-memcache ,

+.BR use-machine-creds ,

+.BR avoid-dns ,

+.BR limit-to-legacy-enctypes ,

+.BR context-timeout ,

+.BR rpc-timeout ,

+.BR pipefs-directory ,

+.BR keytab-file ,

+.BR cred-cache-directory ,

+.BR preferred-realm .

+

+See

+.BR rpc.gssd (8)

+for details.

+

+.TP

+.B svcgssd

+Recognized values:

+.BR principal .

+

+See

+.BR rpc.svcgssd (8)

+for details.

+

+.TP

+.B exportfs

+Only

+.B debug=

+is recognized.

+

+.SH FILES

+.I /etc/nfs.conf

+.SH SEE ALSO

+.BR nfsdcltrack (8),

+.BR rpc.nfsd (8),

+.BR rpc.mountd (8),

+.BR nfsmount.conf (5).

diff -up nfs-utils-1.3.0/systemd/nfs.systemd.man.orig nfs-utils-1.3.0/systemd/nfs.systemd.man

--- nfs-utils-1.3.0/systemd/nfs.systemd.man.orig	2017-03-28 13:45:11.000000000 -0400

+++ nfs-utils-1.3.0/systemd/nfs.systemd.man	2017-03-28 13:45:11.000000000 -0400

@@ -0,0 +1,167 @@

+.TH NFS.SYSTEMD 7

+.SH NAME

+nfs.systemd \- managing NFS services through systemd.

+.SH SYNOPSIS

+nfs-utils.service

+.br

+nfs-server.service

+.br

+nfs-client.target

+.br

+.I etc

+.SH DESCRIPTION

+The

+.I nfs-utils

+package provides a suite of

+.I systemd

+unit files which allow the various services to be started and

+managed.  These unit files ensure that the services are started in the

+correct order, and the prerequisites are active before dependant

+services start.  As there are quite  few unit files, it is not

+immediately obvious how best to achieve certain results.  The

+following subsections attempt to cover the issues that are most likely

+to come up.

+.SS Configuration

+The standard systemd unit files do not provide any easy way to pass

+any command line arguments to daemons so as to configure their

+behavior.  In many case such configuration can be performed by making

+changes to

+.I /etc/nfs.conf

+or other configuration files.  When that is not convenient, a

+distribution might provide systemd "drop-in" files which replace the

+.B ExecStart=

+setting to start the program with different arguments.  For example a

+drop-in file

+.B systemd/system/nfs-mountd.service.d/local.conf

+containing

+.RS

+.nf

+[Service]

+EnvironmentFile=/etc/sysconfig/nfs

+ExecStart=

+ExecStart= /usr/sbin/rpc.mountd $RPCMOUNTDOPTS

+.fi

+.RE

+would cause the

+.B nfs-mountd.service

+unit to run the

+.I rpc.mountd

+program using, for arguments, the value given for

+.B RPCMOUNTDOPTS

+in

+.IR /etc/sysconfig/nfs .

+This allows for seamless integration with existing configuration

+tools.

+.SS Enabling unit files

+There are three unit files which are designed to be manually enabled.

+All others are automatically run as required.  The three are:

+.TP

+.B nfs-client.target

+This should be enabled on any host which ever serves as an NFS client.

+There is little cost in transparently enabling it whenever NFS client

+software is installed.

+.TP

+.B nfs-server.service

+This must be enabled to provide NFS service to clients.  It starts and

+configures the required daemons in the required order.

+.TP

+.B nfs-blkmap.service

+The

+.B blkmapd

+daemon is only required on NFS clients which are using pNFS (parallel

+NFS), and particularly using the

+.B blocklayout

+layout protocol.  If you might use this particular extension to NFS,

+the

+.B nfs-blkmap.service

+unit should be enabled.

+.PP

+Several other units which might be considered to be optional, such as

+.I rpc-gssd.service

+are careful to only start if the required configuration file exists.

+.I rpc-gsdd.service

+will not start if the

+.I krb5.keytab

+file does not exist (typically in

+.IR /etc ).

+.SS Restarting NFS services

+Most NFS daemons can be restarted at any time.  They will reload any

+state that they need, and continue servicing requests.  This is rarely

+necessary though.

+.PP

+When configuration changesare make, it can be hard to know exactly

+which services need to be restarted to ensure that the configuration

+takes effect.  The simplest approach, which is often the best, is to

+restart everything.  To help with this, the

+.B nfs-utils.service

+unit is provided.  It declares appropriate dependencies with other

+unit files so that

+.RS

+.B systemctl restart nfs-utils

+.RE

+will restart all NFS daemons that are running.  This will cause all

+configuration changes to take effect

+.I except

+for changes to mount options lists in

+.I /etc/fstab

+or

+.IR /etc/nfsmount.conf .

+Mount options can only be changed by unmounting and remounting

+filesystem.  This can be a disruptive operation so it should only be

+done when the value justifies the cost.  The command

+.RS

+.B umount -a -t nfs; mount -a -t nfs

+.RE

+should unmount and remount all NFS filesystems.

+.SS Masking unwanted services

+Rarely there may be a desire to prohibit some services from running

+even though there are normally part of a working NFS system.  This may

+be needed to reduce system load to an absolute minimum, or to reduce

+attack surface by not running daemons that are not absolutely

+required.

+.PP

+Two particular services which this can apply to are

+.I rpcbind

+and

+.IR idmapd .

+.I rpcbind

+is not part of the

+.I nfs-utils

+package, but it used by several NFS services.  However it is

+.B not

+needed when only NFSv4 is in use.  If a site will never use NFSv3 (or

+NFSv2) and does not want

+.I rpcbind

+to be running, the correct approach is to run

+.RS

+.B systemctl mask rpcbind

+.RE