Blame SOURCES/autofs-5.1.3-handle-additional-nfs-versions-in-mount_nfs_c.patch

f4add2
autofs-5.1.3 - handle additional nfs versions in mount_nfs.c
f4add2
f4add2
From: Ian Kent <raven@themaw.net>
f4add2
f4add2
Since NFSv4 can now have a subversion it needs to be allowed for.
f4add2
f4add2
It's enough to check for an options string starting with "vers=4" or
f4add2
"nfsvers=4" because it's used only to set a flag used for special
f4add2
casing the availibility probe for any NFS version 4 version.
f4add2
f4add2
Signed-off-by: Ian Kent <raven@themaw.net>
f4add2
---
f4add2
 CHANGELOG           |    1 +
f4add2
 modules/mount_nfs.c |    5 +++--
f4add2
 2 files changed, 4 insertions(+), 2 deletions(-)
f4add2
f4add2
--- autofs-5.0.7.orig/CHANGELOG
f4add2
+++ autofs-5.0.7/CHANGELOG
cef8f8
@@ -263,6 +263,7 @@
cef8f8
 - be silent about sss library not found.
cef8f8
 - be silent about nis domain not set.
cef8f8
 - make map source reference message debug only.
f4add2
+- handle additional nfs versions in mount_nfs.c.
f4add2
 
f4add2
 25/07/2012 autofs-5.0.7
f4add2
 =======================
f4add2
--- autofs-5.0.7.orig/modules/mount_nfs.c
f4add2
+++ autofs-5.0.7/modules/mount_nfs.c
f4add2
@@ -148,8 +148,9 @@ int mount_mount(struct autofs_point *ap,
f4add2
 			} else if (_strncmp("use-weight-only", cp, o_len) == 0) {
f4add2
 				flags |= MOUNT_FLAG_USE_WEIGHT_ONLY;
f4add2
 			} else {
f4add2
-				if (_strncmp("vers=4", cp, o_len) == 0 ||
f4add2
-				    _strncmp("nfsvers=4", cp, o_len) == 0)
f4add2
+				/* Is any version of NFSv4 in the options */
f4add2
+				if (_strncmp("vers=4", cp, 6) == 0 ||
f4add2
+				    _strncmp("nfsvers=4", cp, 9) == 0)
f4add2
 					vers = NFS4_VERS_MASK | TCP_SUPPORTED;
f4add2
 				else if (_strncmp("vers=3", cp, o_len) == 0 ||
f4add2
 					 _strncmp("nfsvers=3", cp, o_len) == 0) {