Blame SOURCES/autofs-5.0.7-fix-fix-map-entry-duplicate-offset-detection.patch
|
 |
306fa1 |
autofs-5.0.7 - fix fix map entry duplicate offset detection
|
|
|
306fa1 |
|
|
|
306fa1 |
From: Ian Kent <raven@themaw.net>
|
|
|
306fa1 |
|
|
|
306fa1 |
Map entry duplicate detection was still broken.
|
|
|
306fa1 |
This hopefully will fix it, at least the Conectathon duplicate offset entry
|
|
|
306fa1 |
tests pass now.
|
|
|
306fa1 |
---
|
|
|
306fa1 |
CHANGELOG | 1 +
|
|
|
306fa1 |
lib/cache.c | 2 +-
|
|
|
306fa1 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
306fa1 |
|
|
|
306fa1 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
306fa1 |
index e15aa1f..39d7889 100644
|
|
|
306fa1 |
--- a/CHANGELOG
|
|
|
306fa1 |
+++ b/CHANGELOG
|
|
|
306fa1 |
@@ -47,6 +47,7 @@
|
|
|
306fa1 |
- dont probe rdma mounts.
|
|
|
306fa1 |
- fix master map mount options matching.
|
|
|
306fa1 |
- fix master map bogus keywork match.
|
|
|
306fa1 |
+- fix fix map entry duplicate offset detection.
|
|
|
306fa1 |
|
|
|
306fa1 |
25/07/2012 autofs-5.0.7
|
|
|
306fa1 |
=======================
|
|
|
306fa1 |
diff --git a/lib/cache.c b/lib/cache.c
|
|
|
306fa1 |
index 1e05a99..ecace4a 100644
|
|
|
306fa1 |
--- a/lib/cache.c
|
|
|
306fa1 |
+++ b/lib/cache.c
|
|
|
306fa1 |
@@ -659,7 +659,7 @@ int cache_update_offset(struct mapent_cache *mc, const char *mkey, const char *k
|
|
|
306fa1 |
|
|
|
306fa1 |
me = cache_lookup_distinct(mc, key);
|
|
|
306fa1 |
if (me && me->age == age) {
|
|
|
306fa1 |
- if (me->multi == owner)
|
|
|
306fa1 |
+ if (me == owner || strcmp(me->key, key) == 0)
|
|
|
306fa1 |
return CHE_DUPLICATE;
|
|
|
306fa1 |
}
|
|
|
306fa1 |
|