From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Feb 2018 22:42:58 +0000 (+0100)
Subject: user-sessions: let's simplify our code paths a bit
X-Git-Tag: v238~74^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6079afa9b07e47c9b3526177243c97c386bc3077;p=thirdparty%2Fsystemd.git

user-sessions: let's simplify our code paths a bit

Let's always go through mac_selinux_finish(), by making our
success/failure codepaths more alike.

This also saves a few lines of code. Yay!
---

diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 1aed9adae73..5e02ede402a 100644
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -48,22 +48,19 @@ int main(int argc, char*argv[]) {
         if (streq(argv[1], "start")) {
                 r = unlink_or_warn("/run/nologin");
                 k = unlink_or_warn("/etc/nologin");
-                if (r < 0 || k < 0)
-                        return EXIT_FAILURE;
+                if (k < 0 && r >= 0)
+                        r = k;
 
         } else if (streq(argv[1], "stop")) {
                 r = write_string_file_atomic_label("/run/nologin", "System is going down.");
-                if (r < 0) {
+                if (r < 0)
                         log_error_errno(r, "Failed to create /run/nologin: %m");
-                        return EXIT_FAILURE;
-                }
 
         } else {
-                log_error("Unknown verb %s.", argv[1]);
-                return EXIT_FAILURE;
+                log_error("Unknown verb '%s'.", argv[1]);
+                r = -EINVAL;
         }
 
         mac_selinux_finish();
-
-        return EXIT_SUCCESS;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }