Ian Kent 62ad96
autofs-5.0.3 - fix nfs4 colon escape handling
Ian Kent 62ad96
Ian Kent 62ad96
From: Ian Kent <raven@themaw.net>
Ian Kent 62ad96
Ian Kent 62ad96
When fstype=nfs4 is given for a mount entry that should be bind
Ian Kent 62ad96
mounted because it has a ":" escaped location the colon can be
Ian Kent 62ad96
discarded before the mount module is called. This causes an
Ian Kent 62ad96
incorrect mount fail return since the replicated selection code
Ian Kent 62ad96
expects the colon to be present for parsing.
Ian Kent 62ad96
---
Ian Kent 62ad96
Ian Kent 62ad96
 modules/parse_sun.c |    2 +-
Ian Kent 62ad96
 1 files changed, 1 insertions(+), 1 deletions(-)
Ian Kent 62ad96
Ian Kent 62ad96
Ian Kent 62ad96
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
Ian Kent 62ad96
index b548520..333f8a5 100644
Ian Kent 62ad96
--- a/modules/parse_sun.c
Ian Kent 62ad96
+++ b/modules/parse_sun.c
Ian Kent 62ad96
@@ -638,7 +638,7 @@ static int sun_mount(struct autofs_point *ap, const char *root,
Ian Kent 62ad96
 	}
Ian Kent 62ad96
 
Ian Kent 62ad96
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
Ian Kent 62ad96
-	if (!strcmp(fstype, "nfs")) {
Ian Kent 62ad96
+	if (!strcmp(fstype, "nfs") || !strcmp(fstype, "nfs4")) {
Ian Kent 62ad96
 		what = alloca(loclen + 1);
Ian Kent 62ad96
 		memcpy(what, loc, loclen);
Ian Kent 62ad96
 		what[loclen] = '\0';