From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 9 Jul 2013 13:45:37 +0000 (+0200)
Subject: journald-server: r should be checked after journal_file_open_reliably
X-Git-Tag: v206~123
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=433dd100442e8197868def975c6fd38b48dc6439;ds=sidebyside

journald-server: r should be checked after journal_file_open_reliably
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 44ba916f1..6beaa8a72 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -910,11 +910,12 @@ static int system_journal_open(Server *s) {
 
                 if (r >= 0)
                         server_fix_perms(s, s->system_journal, 0);
-        } else if (r < 0) {
-                if (r != -ENOENT && r != -EROFS)
-                        log_warning("Failed to open system journal: %s", strerror(-r));
+                else if (r < 0) {
+                        if (r != -ENOENT && r != -EROFS)
+                                log_warning("Failed to open system journal: %s", strerror(-r));
 
-                r = 0;
+                        r = 0;
+                }
         }
 
         if (!s->runtime_journal &&