SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run: default run0 to root explicitly

Browse Source 
When neither --user=, --area= nor --empower is given, run0 already
behaves as if root was requested, but only implicitly. That can be
misleading downstream.

Set arg_exec_user to "root" up front in parse_argv_sudo_mode(), so the
intent is visible and the rest of the code can rely on it.

Fixes #40468

Signed-off-by: Shihao Ren <renshihao.rsh@bytedance.com>
This commit is contained in:
Shihao Ren
2026-07-02 21:34:15 +02:00
committed by Lennart Poettering
parent 977dc1784b
commit 4fb350a46a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/run/run.c
+9 -3
View File
@@ -968,14 +968,20 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
arg_working_directory = mfree(arg_working_directory);
}
if (!arg_exec_user && (arg_area || arg_empower)) {
if (!arg_exec_user) {
/* If the user specifies --area= but not --user= then consider this an area switch request,
* and default to logging into our own account.
*
* If the user specifies --empower but not --user= then consider this a request to empower
* the current user. */
* the current user.
*
* If neither --user=, --area= nor --empower is specified, default to switching to root
* explicitly. */
arg_exec_user = getusername_malloc();
if (arg_area || arg_empower)
arg_exec_user = getusername_malloc();
else
arg_exec_user = strdup("root");
if (!arg_exec_user)
return log_oom();
}