picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journalctl: immeidately terminate on invalid seed

Browse source
This commit is contained in:
Lennart Poettering 2012-08-16 21:00:34 +02:00
parent b7c9ae91d1
commit 56e81f7ca8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/journal/journal-verify.c
View file

@ -667,7 +667,7 @@ int journal_file_verify(JournalFile *f, const char *seed) {
r = journal_file_parse_seed(f, seed);
if (r < 0) {
log_error("Failed to parse seed.");
goto fail;
return r;
}
}

9
src/journal/journalctl.c
View file

@ -601,13 +601,18 @@ static int verify(sd_journal *j) {
HASHMAP_FOREACH(f, j->files, i) {
int k;
#ifdef HAVE_GCRYPT
if (!arg_verify_seed && journal_file_fsprg_enabled(f))
log_warning("Journal file %s has authentication enabled but verification seed has not been passed using --verify-seed=.", f->path);
#endif
k = journal_file_verify(f, arg_verify_seed);
if (k < 0) {
if (k == -EINVAL) {
/* If the seed was invalid give up right-away. */
return k;
} else if (k < 0) {
log_warning("FAIL: %s (%s)", f->path, strerror(-k));
r = -r;
r = k;
} else
log_info("PASS: %s", f->path);
}