39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
autofs-5.1.7 - fix nonstrict offset mount fail handling
|
|
|
|
From: Ian Kent <raven@themaw.net>
|
|
|
|
If a triggered offset mount fails automount is no honouring nonstrict
|
|
mount failure.
|
|
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
---
|
|
CHANGELOG | 1 +
|
|
modules/parse_sun.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index f5f0da76..ecffa933 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -77,6 +77,7 @@
|
|
- fix hosts map offset order.
|
|
- fix direct mount deadlock.
|
|
- add missing description of null map option.
|
|
+- fix nonstrict offset mount fail handling.
|
|
|
|
25/01/2021 autofs-5.1.7
|
|
- make bind mounts propagation slave by default.
|
|
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
|
|
index 12844a30..cdf515c6 100644
|
|
--- a/modules/parse_sun.c
|
|
+++ b/modules/parse_sun.c
|
|
@@ -1181,7 +1181,7 @@ static int mount_subtree(struct autofs_point *ap, struct mapent_cache *mc,
|
|
* offsets to be mounted.
|
|
*/
|
|
rv = sun_mount(ap, name, name, namelen, loc, loclen, options, ctxt);
|
|
- if (rv == 0) {
|
|
+ if (rv <= 0) {
|
|
ret = tree_mapent_mount_offsets(me, 1);
|
|
if (!ret) {
|
|
tree_mapent_cleanup_offsets(me);
|