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