systemd/nfs-blkmap.service | 2 1 + 1 - 0 !
utils/blkmapd/device-discovery.c | 2 1 + 1 - 0 !
utils/statd/sm-notify.c | 4 2 + 2 - 0 !
utils/statd/statd.c | 2 1 + 1 - 0 !
utils/statd/statd.man | 2 1 + 1 - 0 !
5 files changed, 6 insertions(+), 6 deletions(-)

 pid files should be in /run, not /var/run
 Now that the /run transition is a stable release behind us, we should always
 use /run, not /var/run, for PID files.  This improves our out-of-the-box
 compatibility with /var being on a separate filesystem (possibly even an
 NFS mount itself).
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1157171

utils/statd/statd.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

utils/mount/fstab.c | 2 1 + 1 - 0 !
utils/mount/fstab.h | 1 1 + 0 - 0 !
utils/mount/mount.c | 7 7 + 0 - 0 !
3 files changed, 9 insertions(+), 1 deletion(-)

---

aclocal/kerberos5.m4 | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

---

utils/osd_login/osd_login | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

---

systemd/nfs-blkmap.service | 4 2 + 2 - 0 !
systemd/nfs-idmapd.service | 4 2 + 2 - 0 !
systemd/rpc-gssd.service | 4 2 + 2 - 0 !
systemd/rpc-svcgssd.service | 4 2 + 2 - 0 !
systemd/run-rpc_pipefs.mount | 9 9 + 0 - 0 !
systemd/var-lib-nfs-rpc_pipefs.mount | 10 0 + 10 - 0 !
6 files changed, 17 insertions(+), 18 deletions(-)

 systemd: mount rpc_pipefs in /run instead of /var/lib/nfs/

systemd/rpc-statd-notify.service | 2 1 + 1 - 0 !
systemd/rpc-statd.service | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 adjust program paths in systemd units

systemd/nfs-client.target | 4 1 + 3 - 0 !
systemd/nfs-server.service | 3 1 + 2 - 0 !
systemd/rpc-statd-notify.service | 3 3 + 0 - 0 !
systemd/rpc-statd.service | 5 4 + 1 - 0 !
4 files changed, 9 insertions(+), 6 deletions(-)

 let sysadmins enable/disable statd services
 As the admin was able to control under upstart the statd services with
 NEED_STATD in default conffiles, mirror this funcationality under systemd
 by letting the user systemctl enable/disable statd services.

utils/blkmapd/device-discovery.c | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 nfs-common: move of rpc_pipefs mountpoint to /run breaks blkmapd

commit ba649fa4 ("Migrate the rpc_pipefs mount out of /var/lib to /run, to
better support /var on NFS.") in the Debian packaging repo completely
broke blkmapd, which still looks for rpc_pipefs in the old place.
From looking in the BTS gssd also seems to have the same problem (#632141).

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828826

utils/gssd/gssd.h | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 move of rpc_pipefs mountpoint to /run breaks gssd

This is a followup patch for gssd also needing to know about the new
rpc_pipefs location, as mentioned in https://bugs.debian.org/828826

Bug-Debian: https://bugs.debian.org/632141

nfs-config.service | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

utils/statd/start-statd | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

support/nsm/rpc.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 rpc.c: added include file so uint16_max is defined.

Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/nfs-server.service | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 remove extra boggus whitespaces from .service files

utils/blkmapd/device-discovery.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

---

utils/gssd/gssd_proc.c | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 gssd: replace non-thread-safe strtok with strsep

gssd uses the non-thread-safe strtok() function, which
can lead to incorrect program behavior.

Replace strtok() with the thread-safe strsep().

Signed-off-by: Frank Sorenson <sorenson@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

utils/gssd/gssd_proc.c | 17 13 + 4 - 0 !
1 file changed, 13 insertions(+), 4 deletions(-)

 gssd:  duplicate the upcall string for error messages

strsep() modifies the input string, so error messages
may output only part of the upcall string.

Make a copy of the upcall string, and use that in any
error messages.

Signed-off-by: Frank Sorenson <sorenson@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

tools/nfs-iostat/nfs-iostat.py | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 nfsiostat: replace 'list' reserved word

support/nsm/file.c | 16 5 + 11 - 0 !
utils/statd/sm-notify.man | 10 9 + 1 - 0 !
utils/statd/statd.man | 10 9 + 1 - 0 !
3 files changed, 23 insertions(+), 13 deletions(-)

 statd: take user-id from /var/lib/nfs/sm

support/nfs/conffile.c | 1 0 + 1 - 0 !
utils/mountd/v4root.c | 2 0 + 2 - 0 !
utils/statd/statd.c | 1 1 + 0 - 0 !
utils/statd/statd.h | 2 1 + 1 - 0 !
4 files changed, 2 insertions(+), 4 deletions(-)

 allow compilation to succeed with -fno-common

tools/mountstats/mountstats.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 mountstats:  remove a shebang

tools/mountstats/mountstats.py | 2 1 + 1 - 0 !
tools/nfs-iostat/nfs-iostat.py | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 convert remaining python scripts to python3

utils/mountd/fsloc.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 removed a resource leak from mountd/fsloc.c

utils/exportfs/exportfs.c | 12 7 + 5 - 0 !
1 file changed, 7 insertions(+), 5 deletions(-)

 exportfs: make sure pass all valid export flags to nfsd