Blame autofs-5.0.7-fix-probe-each-nfs-version-in-turn-for-singleton-mounts.patch
|
Ian Kent |
60148b |
autofs-5.0.7 - fix probe each nfs version in turn for singleton mounts
|
|
Ian Kent |
60148b |
|
|
Ian Kent |
60148b |
From: Ian Kent <raven@themaw.net>
|
|
Ian Kent |
60148b |
|
|
Ian Kent |
60148b |
If there aren't any hosts in the list returned from parse_location() make sure
|
|
Ian Kent |
60148b |
the probe checks are skipped.
|
|
Ian Kent |
60148b |
---
|
|
Ian Kent |
60148b |
CHANGELOG | 1 +
|
|
Ian Kent |
60148b |
modules/mount_nfs.c | 2 +-
|
|
Ian Kent |
60148b |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
Ian Kent |
60148b |
|
|
Ian Kent |
60148b |
diff --git a/CHANGELOG b/CHANGELOG
|
|
Ian Kent |
60148b |
index 25179b1..0242c11 100644
|
|
Ian Kent |
60148b |
--- a/CHANGELOG
|
|
Ian Kent |
60148b |
+++ b/CHANGELOG
|
|
Ian Kent |
60148b |
@@ -50,6 +50,7 @@
|
|
Ian Kent |
60148b |
- fix fix map entry duplicate offset detection.
|
|
Ian Kent |
60148b |
- probe each nfs version in turn for singleton mounts.
|
|
Ian Kent |
60148b |
- add changlog entry for coverity fixes.
|
|
Ian Kent |
60148b |
+- fix probe each nfs version in turn for singleton mounts.
|
|
Ian Kent |
60148b |
|
|
Ian Kent |
60148b |
25/07/2012 autofs-5.0.7
|
|
Ian Kent |
60148b |
=======================
|
|
Ian Kent |
60148b |
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
|
|
Ian Kent |
60148b |
index 81ba3ca..9de8a73 100644
|
|
Ian Kent |
60148b |
--- a/modules/mount_nfs.c
|
|
Ian Kent |
60148b |
+++ b/modules/mount_nfs.c
|
|
Ian Kent |
60148b |
@@ -190,7 +190,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
|
|
Ian Kent |
60148b |
* to NFSv3 (if it can). If the NFSv4 probe fails then probe as
|
|
Ian Kent |
60148b |
* normal.
|
|
Ian Kent |
60148b |
*/
|
|
Ian Kent |
60148b |
- if (!hosts->next &&
|
|
Ian Kent |
60148b |
+ if ((hosts && !hosts->next) &&
|
|
Ian Kent |
60148b |
mount_default_proto == 4 &&
|
|
Ian Kent |
60148b |
vers & NFS_VERS_MASK != 0 &&
|
|
Ian Kent |
60148b |
vers & NFS4_VERS_MASK != 0) {
|