autofs-5.1.6 - fix direct mount unlink_mount_tree() path
From: Ian Kent <raven@themaw.net>
Oops!
The path used if unlink_mount_tree() is called for direct mount entries
is not correct, fix it.
Note: the mount table handling has changed and using the --force option
with automount when direct mount maps are large will result in somewhat
larger overhead.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/direct.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- autofs-5.0.7.orig/CHANGELOG
+++ autofs-5.0.7/CHANGELOG
@@ -355,6 +355,7 @@
- initialize struct addrinfo for getaddrinfo() calls.
- fix quoted string length calc in expandsunent().
- fix autofs mount options construction.
+- fix direct mount unlink_mount_tree() path.
25/07/2012 autofs-5.0.7
=======================
--- autofs-5.0.7.orig/daemon/direct.c
+++ autofs-5.0.7/daemon/direct.c
@@ -310,7 +310,7 @@ int do_mount_autofs_direct(struct autofs
return 0;
}
- ret = unlink_mount_tree(ap, ap->path);
+ ret = unlink_mount_tree(ap, me->key);
if (!ret) {
error(ap->logopt,
"already mounted as other than autofs "