picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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!
This commit is contained in:
Lennart Poettering 2018-02-21 23:42:58 +01:00
parent ad383382c7
commit 6079afa9b0
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/user-sessions/user-sessions.c
View file

@ -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;
}