mount.nfs: Fix auto protocol negotiation (bz 1565310)

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

nfs-utils-2.3.1-mount-auto-v3.patch

@@ -0,0 +1,32 @@
+commit 5f32083c759b468f5b0cb9302e4fe2848d37cc5b
+Author: Steve Dickson <steved@redhat.com>
+Date:   Tue Apr 10 10:25:40 2018 -0400
+
+    mount.nfs: Fix auto protocol negotiation
+    
+    Commit 71b807e1 introduce a regression that
+    caused v3 not to be tried when v4 was not
+    supported by the server during auto negation.
+    
+    A check of the type in nfs_nfs_version() was
+    reverted back to only check for the "nfs4"
+    string not the "nfs" string which fixed the
+    problem.
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/mount/network.c b/utils/mount/network.c
+index 9a2c878..e490399 100644
+--- a/utils/mount/network.c
++++ b/utils/mount/network.c
+@@ -1279,8 +1279,8 @@ nfs_nfs_version(char *type, struct mount_options *options, struct nfs_version *v
+ 		}
+ 	}
+ 
+-	if (!found && strncmp(type, "nfs", 3) == 0)
+-		version_val = "4";
++	if (!found && strcmp(type, "nfs4") == 0)
++		version_val = type + 3;
+ 	else if (!found)
+ 		return 1;
+ 	else if (i <= 2 ) {

nfs-utils.spec

@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.3.1
-Release: 6.rc1%{?dist}
+Release: 7.rc1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -16,6 +16,7 @@ Source4: lockd.conf
 Source5: 24-nfs-server.conf
 
 Patch001: nfs-utils-2.3.2-rc1.patch
+Patch002: nfs-utils-2.3.1-mount-auto-v3.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -309,6 +310,9 @@ fi
 %{_libdir}/libnfsidmap.so
 
 %changelog
+* Wed Apr 11 2018 Steve Dickson <steved@redhat.com> 2.3.1-7.rc1
+- mount.nfs: Fix auto protocol negotiation (bz 1565310)
+
 * Mon Apr  9 2018 Steve Dickson <steved@redhat.com> 2.3.1-6.rc1
 - Stop failing when systemctl try-restart gssproxy fails (bz 1552976)
 - Use Fedora build flags (bz 1548679)