You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1000 B
27 lines
1000 B
7 years ago
|
From 5633544097b9c3bf3d63ef3be9e7db5d4e1f49dc Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sun, 8 Mar 2015 11:11:50 -0400
|
||
|
|
Subject: [PATCH] sd-journal: return error when we cannot open a file
|
||
|
|
|
||
|
|
Lack of this caused journalctl not to display a hint about missing groups
|
||
|
|
properly when the user lacks permissions.
|
||
|
|
|
||
|
|
(cherry picked from commit 7b300be75e6d5755778dd7da63e7147866f21351)
|
||
|
|
---
|
||
|
|
src/journal/sd-journal.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
|
||
|
|
index 9b57e5945..9b9e8ac85 100644
|
||
|
|
--- a/src/journal/sd-journal.c
|
||
|
|
+++ b/src/journal/sd-journal.c
|
||
|
|
@@ -1248,7 +1248,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) {
|
||
|
|
r = add_any_file(j, path);
|
||
|
|
if (r == -ENOENT)
|
||
|
|
return 0;
|
||
|
|
- return 0;
|
||
|
|
+ return r;
|
||
|
|
}
|
||
|
|
|
||
|
|
static int remove_file(sd_journal *j, const char *prefix, const char *filename) {
|