chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locale: make sure that l is freed
[elogind.git]
/
src
/
journal
/
journal-verify.c
diff --git
a/src/journal/journal-verify.c
b/src/journal/journal-verify.c
index 9156fd5dc0a3e7d0c94a13edf468bcf2353fb5a4..629b2389bc5ea24bc0c18cade52e3635f91825ea 100644
(file)
--- a/
src/journal/journal-verify.c
+++ b/
src/journal/journal-verify.c
@@
-63,6
+63,7
@@
static int journal_file_object_verify(JournalFile *f, Object *o) {
h1 = le64toh(o->data.hash);
if (o->object.flags & OBJECT_COMPRESSED) {
h1 = le64toh(o->data.hash);
if (o->object.flags & OBJECT_COMPRESSED) {
+#ifdef HAVE_XZ
void *b = NULL;
uint64_t alloc = 0, b_size;
void *b = NULL;
uint64_t alloc = 0, b_size;
@@
-73,6
+74,9
@@
static int journal_file_object_verify(JournalFile *f, Object *o) {
h2 = hash64(b, b_size);
free(b);
h2 = hash64(b, b_size);
free(b);
+#else
+ return -EPROTONOSUPPORT;
+#endif
} else
h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
} else
h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
@@
-955,7
+959,7
@@
int journal_file_verify(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = journal_file_hmac_put_object(f, -1, q);
+ r = journal_file_hmac_put_object(f, -1,
o,
q);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1118,7
+1122,7
@@
int journal_file_verify(
close_nointr_nofail(entry_array_fd);
if (first_validated)
close_nointr_nofail(entry_array_fd);
if (first_validated)
- *first_validated = last_
tag_realtime
? le64toh(f->header->head_entry_realtime) : 0;
+ *first_validated = last_
sealed_realtime > 0
? le64toh(f->header->head_entry_realtime) : 0;
if (last_validated)
*last_validated = last_sealed_realtime;
if (last_contained)
if (last_validated)
*last_validated = last_sealed_realtime;
if (last_contained)