From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Oct 2010 21:16:48 +0000 (+0200)
Subject: user-sessions: properly unlink both nologin files
X-Git-Tag: v12~266
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4a8a5b2963fca71fca044dcdddc3f767f3cdbd17

user-sessions: properly unlink both nologin files
---

diff --git a/src/user-sessions.c b/src/user-sessions.c
index dc4ee0fb4..802696156 100644
--- a/src/user-sessions.c
+++ b/src/user-sessions.c
@@ -40,16 +40,21 @@ int main(int argc, char*argv[]) {
         log_open();
 
         if (streq(argv[1], "start")) {
+                int q = 0, r = 0;
 
-                if (unlink("/var/run/nologin") < 0 ||
-                    unlink("/etc/nologin") < 0) {
+                if (unlink("/var/run/nologin") < 0 && errno != ENOENT) {
+                        log_error("Failed to remove /var/run/nologin file: %m");
+                        r = -errno;
+                }
 
-                        if (errno != ENOENT) {
-                                log_error("Failed to remove nologin files: %m");
-                                goto finish;
-                        }
+                if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
+                        log_error("Failed to remove /etc/nologin file: %m");
+                        q = -errno;
                 }
 
+                if (r < 0 || q < 0)
+                        goto finish;
+
         } else if (streq(argv[1], "stop")) {
                 int r, q;