You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
2.0 KiB
61 lines
2.0 KiB
3 years ago
|
autofs-5.1.7 - fix nonstrict offset mount fail handling
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
If a triggered offset mount fails automount is not handling nonstrict
|
||
|
|
mount failure correctly.
|
||
|
|
|
||
|
|
The nonstrict mount failure handling needs to convert an offset mount
|
||
|
|
failure to a success if the offset subtree below the failed mount is not
|
||
|
|
empty otherwise it must return the failure. The previous implementation
|
||
|
|
used -1 to indicate the subtree was empty and that was used to detect
|
||
|
|
when the mount should fail instead of converting the fail to a success.
|
||
|
|
|
||
|
|
Make the new implementation do the same.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
lib/mounts.c | 2 +-
|
||
|
|
modules/parse_sun.c | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
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/lib/mounts.c b/lib/mounts.c
|
||
|
|
index 5a4602e3..4c866885 100644
|
||
|
|
--- a/lib/mounts.c
|
||
|
|
+++ b/lib/mounts.c
|
||
|
|
@@ -1616,7 +1616,7 @@ static int tree_mapent_traverse_subtree(struct tree_node *n, tree_work_fn_t work
|
||
|
|
{
|
||
|
|
struct traverse_subtree_context *ctxt = ptr;
|
||
|
|
struct mapent *oe = MAPENT(n);
|
||
|
|
- int ret = 1;
|
||
|
|
+ int ret = -1;
|
||
|
|
|
||
|
|
if (n->left) {
|
||
|
|
ret = tree_mapent_traverse_subtree(n->left, work, ctxt);
|
||
|
|
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);
|