valeriyvdovin / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone
923a60
From 5633544097b9c3bf3d63ef3be9e7db5d4e1f49dc Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
923a60
Date: Sun, 8 Mar 2015 11:11:50 -0400
923a60
Subject: [PATCH] sd-journal: return error when we cannot open a file
923a60
923a60
Lack of this caused journalctl not to display a hint about missing groups
923a60
properly when the user lacks permissions.
923a60
923a60
(cherry picked from commit 7b300be75e6d5755778dd7da63e7147866f21351)
923a60
---
923a60
 src/journal/sd-journal.c | 2 +-
923a60
 1 file changed, 1 insertion(+), 1 deletion(-)
923a60
923a60
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
923a60
index 9b57e5945d..9b9e8ac859 100644
923a60
--- a/src/journal/sd-journal.c
923a60
+++ b/src/journal/sd-journal.c
923a60
@@ -1248,7 +1248,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) {
923a60
         r = add_any_file(j, path);
923a60
         if (r == -ENOENT)
923a60
                 return 0;
923a60
-        return 0;
923a60
+        return r;
923a60
 }
923a60
 
923a60
 static int remove_file(sd_journal *j, const char *prefix, const char *filename) {