summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-12-27 22:58:20 +0100
committerLennart Poettering <lennart@poettering.net>2011-12-27 22:58:20 +0100
commit85a131e8d8aa9fe3c2115e281569bed64a4200f1 (patch)
treef571efa75a0ab79569b6ea8877897f862f4d32b1
parent24b51289e3f61c2483bb61231f8c16b65cf101be (diff)
journal: fix hash table lookup logic
-rw-r--r--src/journal/journal-file.c3
-rw-r--r--src/journal/sd-journal.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 4a006d3bf3..80775e1acf 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -595,7 +595,7 @@ int journal_file_find_data_object_with_hash(
return r;
if (le64toh(o->data.hash) != hash)
- return -EBADMSG;
+ goto next;
if (o->object.flags & OBJECT_COMPRESSED) {
#ifdef HAVE_XZ
@@ -637,6 +637,7 @@ int journal_file_find_data_object_with_hash(
return 1;
}
+ next:
p = le64toh(o->data.next_hash_offset);
}
diff --git a/src/journal/sd-journal.h b/src/journal/sd-journal.h
index 7e2ef15327..9872e9c29c 100644
--- a/src/journal/sd-journal.h
+++ b/src/journal/sd-journal.h
@@ -35,7 +35,6 @@
* - implement audit gateway
* - extend hash tables table as we go
* - accelerate looking for "all hostnames" and suchlike.
- * - throttling
* - cryptographic hash
* - never access beyond fle size check
* - OR of matches is borked...