From 6eda13d3baf39e22143eec18c5807de4925017ec Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 27 Jan 2018 09:32:36 +0100 Subject: [PATCH] journal: losen restrictions on journal file suffix (#8013) Previously, we'd refuse open journal files with suffixes that aren't either .journal or .journal~. With this change we only care when we are creating the journal file. I looked over the sources to see whether we ever pass files discovered by directory enumeration to journal_file_open() without first checking the suffix (in which case the old check made sense), but I couldn't find any. hence I am pretty sure removing this check is safe. Fixes: #7972 --- src/journal/journal-file.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index ae15f4b76a3..3353b3a0d81 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -3253,11 +3253,8 @@ int journal_file_open( if (!IN_SET((flags & O_ACCMODE), O_RDONLY, O_RDWR)) return -EINVAL; - if (fname) { - if (!endswith(fname, ".journal") && - !endswith(fname, ".journal~")) - return -EINVAL; - } + if (fname && (flags & O_CREAT) && !endswith(fname, ".journal")) + return -EINVAL; f = new0(JournalFile, 1); if (!f) -- 2.47.3