forked from pool/systemd
35fc3cae4d
0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch 0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch 0001-journal-warn-when-we-fail-to-append-a-tag-to-a-journ.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=952
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 9f47fe6b6a9aad001e99f1fdea78a0c54ce8ae55 Mon Sep 17 00:00:00 2001
|
|
From: Franck Bui <fbui@suse.com>
|
|
Date: Fri, 23 Sep 2016 12:12:13 +0200
|
|
Subject: [PATCH 1/1] journal: warn when we fail to append a tag to a journal
|
|
|
|
We shouldn't silently fail when appending the tag to a journal file
|
|
since FSS protection will simply be disabled in this case.
|
|
|
|
(cherry picked from commit 43cd8794839548a6f332875e8bee8bed2652bf2c)
|
|
---
|
|
src/journal/journal-file.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
|
index e7eecad..a9882cf 100644
|
|
--- a/src/journal/journal-file.c
|
|
+++ b/src/journal/journal-file.c
|
|
@@ -145,8 +145,13 @@ JournalFile* journal_file_close(JournalFile *f) {
|
|
|
|
#ifdef HAVE_GCRYPT
|
|
/* Write the final tag */
|
|
- if (f->seal && f->writable)
|
|
- journal_file_append_tag(f);
|
|
+ if (f->seal && f->writable) {
|
|
+ int r;
|
|
+
|
|
+ r = journal_file_append_tag(f);
|
|
+ if (r < 0)
|
|
+ log_error_errno(r, "Failed to append tag when closing journal: %m");
|
|
+ }
|
|
#endif
|
|
|
|
journal_file_set_offline(f);
|
|
--
|
|
2.10.0
|
|
|