autofs-5.1.8 - fix nonstrict fail handling of last offset mount

From: Ian Kent <raven@themaw.net>

When mounting a list of multi-mount offsets the offset mount should

succeed even if there's a mount failure for the non-strict case (the

default).

But currently if the last offset mount fails the multi-mount fails

regardless of whether the mount is non-strict or not.

Signed-off-by: Ian Kent <raven@themaw.net>

---

 CHANGELOG    |    1 +

 lib/mounts.c |    2 +-

 2 files changed, 2 insertions(+), 1 deletion(-)

--- autofs-5.1.4.orig/CHANGELOG

+++ autofs-5.1.4/CHANGELOG

@@ -84,6 +84,7 @@

 - fix double quoting in auto.smb.

 - fix double quoting of ampersand in auto.smb as well.

 - fix root offset error handling.

+- fix nonstrict fail handling of last offset mount.

 xx/xx/2018 autofs-5.1.5

 - fix flag file permission.

--- autofs-5.1.4.orig/lib/mounts.c

+++ autofs-5.1.4/lib/mounts.c

@@ -1940,7 +1940,7 @@ static int tree_mapent_mount_offsets_wor

 			tree_mapent_mount_offsets(oe, !ctxt->strict);

 	}

-	return ret;

+	return (ctxt->strict ? ret : 1);

 }

 int tree_mapent_mount_offsets(struct mapent *oe, int nonstrict)