shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 16:21:26 +03:00
Code

systemd: don't try to run as user manager when called without any arguments

Browse Source 
It's better for users if programs don't do "significant" things too easily, and
should be especially conservative when called without any arguments whatsoever.
So far systemd would would try to launch itself as a user manager and fail on
some cgroup permission stuff. systemd --user is run execlusively from user@.service
and there we call it with --user. Calls to the binary without any arguments as
non-pid1 are almost always a mistake.

https://github.com/systemd/systemd/issues/18419#issuecomment-779422571
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-02-16 17:40:56 +01:00 committed by Lennart Poettering
parent 696e5a8a73
commit 9a9ca40803
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/main.c
View File

@ -821,6 +821,7 @@ static int parse_argv(int argc, char *argv[]) {
};
int c, r;
bool user_arg_seen = false;
assert(argc >= 1);
assert(argv);
@ -910,6 +911,7 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_USER:
arg_system = false;
user_arg_seen = true;
break;
case ARG_TEST:
@ -1066,10 +1068,12 @@ static int parse_argv(int argc, char *argv[]) {
}
if (optind < argc && getpid_cached() != 1)
/* Hmm, when we aren't run as init system
* let's complain about excess arguments */
/* Hmm, when we aren't run as init system let's complain about excess arguments */
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Excess arguments.");
if (arg_action == ACTION_RUN && !arg_system && !user_arg_seen)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Excess arguments.");
"Explicit --user argument required to run as user manager.");
return 0;
}