ca38f0b091
- improve mount location error reporting. - fix paged query more results check. - fix dumpmaps not reading maps. - fix result null check in read_one_map(). - Fix LDAP result leaks on error paths. - code analysis fixes 1. - fix not bind mounting local filesystem. - update dir map-type patch for changed patch order. - fix wait for master source mutex. - fix submount shutdown race - fix fix map source check in file lookup. - add disable move mount configure option.
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
autofs-5.0.6 - fix fix map source check in file lookup
|
|
|
|
From: Ian Kent <raven@themaw.net>
|
|
|
|
A recent change to correct a problem with included map entry removal
|
|
has broken a different case of included map key lookup. The check in
|
|
previous patch was too broad and caused map key lookup for keys in an
|
|
included multi-mount map entrys to not be found.
|
|
---
|
|
|
|
CHANGELOG | 1 +
|
|
modules/lookup_file.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index cb9ac75..304b6a2 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -11,6 +11,7 @@
|
|
- add "dir" map-type.
|
|
- fix wait for master source mutex.
|
|
- fix submount shutdown race.
|
|
+- fix fix map source check in file lookup.
|
|
|
|
28/06/2011 autofs-5.0.6
|
|
-----------------------
|
|
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
|
|
index 8ead07c..63b5ae7 100644
|
|
--- a/modules/lookup_file.c
|
|
+++ b/modules/lookup_file.c
|
|
@@ -1046,7 +1046,7 @@ do_cache_lookup:
|
|
* instance (same map entry cache), not in a distinct source.
|
|
*/
|
|
if (me && (!me->mapent ||
|
|
- (ap->type == LKP_INDIRECT && me->source != source))) {
|
|
+ (me->source != source && *me->key != '/'))) {
|
|
while ((me = cache_lookup_key_next(me)))
|
|
if (me->source == source)
|
|
break;
|