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 !
4 files changed, 5 insertions(+), 5 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/exportfs/nfsd.man | 1 1 + 0 - 0 !
utils/nfsd/nfsd.man | 1 1 + 0 - 0 !
2 files changed, 2 insertions(+)

---

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(-)

---

utils/gssd/gss_util.c | 2 1 + 1 - 0 !
utils/gssd/gssd_proc.c | 6 3 + 3 - 0 !
2 files changed, 4 insertions(+), 4 deletions(-)

---

utils/mount/mount.nfs.man | 12 8 + 4 - 0 !
1 file changed, 8 insertions(+), 4 deletions(-)

 [patch] mount.nfs.man, nfs.man: update distinction between fstypes

This addresses Debian bug #575503.

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(-)

---

utils/nfsdcltrack/nfsdcltrack.man | 114 0 + 114 - 0 !
1 file changed, 114 deletions(-)

---

support/export/client.c | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 [patch] mountd: fix segfault in add_name with newer gcc compilers
Bug-Debian: http://bugs.debian.org/757835
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1355829

I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
NULL pointer checks got reordered such that a pointer was dereferenced
before checking to see whether it was NULL. The problem was due to
nfs-utils relying on undefined behavior, which tricked gcc into assuming
that the pointer would never be NULL.

At first I assumed that this was a compiler bug, but Jakub Jelinek and
Jeff Law pointed out:

"If old is NULL, then:

	strncpy(new, old, cp-old);

is undefined behavior (even when cp == old == NULL in that case),
therefore gcc assumes that old is never NULL, as otherwise it would be
invalid.

Just guard
	strncpy(new, old, cp-old);
	new[cp-old] = 0;
with if (old) { ... }."

This patch does that. If old is NULL though, then we still need to
ensure that new is NULL terminated, lest the subsequent strcats walk off
the end of it.

Cc: Jeff Law <law@redhat.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: Steve Dickson <steved@redhat.com>