From ac70f02da9a45edc5b261b64750aca71e83c0d7d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 19 2017 13:25:28 +0000
Subject: import nfs-utils-1.3.0-0.48.el7_4


---

diff --git a/SOURCES/nfs-utils-1.3.0-mount-addressfailed.patch b/SOURCES/nfs-utils-1.3.0-mount-addressfailed.patch
new file mode 100644
index 0000000..8fe08e9
--- /dev/null
+++ b/SOURCES/nfs-utils-1.3.0-mount-addressfailed.patch
@@ -0,0 +1,30 @@
+diff -up nfs-utils-1.3.0/utils/nfsd/nfssvc.c.orig nfs-utils-1.3.0/utils/nfsd/nfssvc.c
+--- nfs-utils-1.3.0/utils/nfsd/nfssvc.c.orig	2017-10-05 11:34:15.701116069 -0400
++++ nfs-utils-1.3.0/utils/nfsd/nfssvc.c	2017-10-05 11:35:36.493684800 -0400
+@@ -112,7 +112,7 @@ static int
+ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
+ {
+ 	int fd, on = 1, fac = L_ERROR;
+-	int sockfd = -1, rc = 0;
++	int sockfd = -1, rc = 0, bounded = 0;
+ 	struct addrinfo *addrhead = NULL, *addr;
+ 	char *proto, *family;
+ 
+@@ -234,6 +234,8 @@ nfssvc_setfds(const struct addrinfo *hin
+ 			rc = errno;
+ 			goto error;
+ 		}
++		bounded++;
++
+ 		close(fd);
+ 		close(sockfd);
+ 		sockfd = fd = -1;
+@@ -246,7 +248,7 @@ error:
+ 		close(sockfd);
+ 	if (addrhead)
+ 		freeaddrinfo(addrhead);
+-	return rc;
++	return (bounded ? 0 : rc);
+ }
+ 
+ int
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index a8d651a..d198922 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -125,6 +125,10 @@ Patch094: nfs-utils-1.3.0-systemd-gssproxy.patch
 Patch095: nfs-utils-1.3.0-mount-use-minor-default.patch
 Patch096: nfs-utils-1.3.0-mount-restore-econn.patch
 Patch097: nfs-utils-1.3.0-exportfs-path-comp.patch
+#
+# RHEL7.4-Z
+#
+Patch098: nfs-utils-1.3.0-mount-addressfailed.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -376,6 +380,8 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch096 -p1
 # 1389046 Pacemaker node fenced out due to redundant export...
 %patch097 -p1
+# 1498959 - RHEL7.4: service nfs-server start fails the first time...
+%patch098 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -627,6 +633,9 @@ fi
 /sbin/umount.nfs4
 
 %changelog
+* Fri Oct  6 2017 Steve Dickson <steved@redhat.com> 1.3.0-0.48_4
+- rpc.nfsd: Do not fail when all address families are not support (bz 1450528)
+
 * Mon Jun 19 2017 Steve Dickson <steved@redhat.com> 1.3.0-0.48
 - exportfs: fix path comparison in unexportfs_parsed() (bz 1389046)
 - Correctly set the minor version when set in nfsmount.conf (1458504)