chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48b6173
)
journal: don't set seal flag if we don't have gcrypt built-in
author
Lennart Poettering
<lennart@poettering.net>
Tue, 11 Sep 2012 01:03:36 +0000
(
03:03
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 11 Sep 2012 01:03:36 +0000
(
03:03
+0200)
src/journal/journal-file.c
patch
|
blob
|
history
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index 8bd52733c97db551d04f86cd31cee63a18b0cd3c..8016852b9163d2f4f1e34d3e022f50f1606bba67 100644
(file)
--- a/
src/journal/journal-file.c
+++ b/
src/journal/journal-file.c
@@
-2024,7
+2024,9
@@
int journal_file_open(
#ifdef HAVE_XZ
f->compress = compress;
#endif
+#ifdef HAVE_GCRYPT
f->seal = seal;
+#endif
if (mmap_cache)
f->mmap = mmap_cache_ref(mmap_cache);
@@
-2059,9
+2061,11
@@
int journal_file_open(
#ifdef HAVE_GCRYPT
/* Try to load the FSPRG state, and if we can't, then
* just don't do sealing */
- r = journal_file_fss_load(f);
- if (r < 0)
- f->seal = false;
+ if (f->seal) {
+ r = journal_file_fss_load(f);
+ if (r < 0)
+ f->seal = false;
+ }
#endif
r = journal_file_init_header(f, template);