journald: don't choke on journal files with no cutoff date

diff --git a/TODO b/TODO
index 27fc5a3a4fb169092a7bbdf60f1c65b70cf12e14..9d09916b28752d7a396c6a9d993c0107de9235fe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -40,6 +40,10 @@ Features:
 
 * syscall filter: add knowledge about compat syscalls
 
+* syscall filter: don't enforce no new privs?
+
+* syscall filter: option to return EPERM rather than SIGSYS?
+
 * logind: wakelock/opportunistic suspend support
 
 * switch-root: sockets need relabelling

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 497f79cb525a33ae0b195fd3da3e1ab20f440eed..c3f19ca697a4396150c8c43d99b5dd4ee00822a0 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1950,6 +1950,8 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
                 usec_t fr, t;
 
                 r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
+                if (r == -ENOENT)
+                        continue;
                 if (r < 0)
                         return r;
                 if (r == 0)
@@ -1987,6 +1989,8 @@ _public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot
                 usec_t fr, t;
 
                 r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
+                if (r == -ENOENT)
+                        continue;
                 if (r < 0)
                         return r;
                 if (r == 0)