morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

run: merge privileged_execution() into become_root()

Browse Source 
This got split in 5cabeed80b
to accommodate --empower, and later --empower received
dedicated handling again (c36942916b).
I think the new naming makes more sense - --empower is privileged
after all, just with uid left unchanged. Hence merge
privileged_execution back into it.
This commit is contained in:
Mike Yuan
2025-11-25 18:42:11 +01:00
committed by Luca Boccassi
parent 2207b7f9a4
commit 2ef2002a96
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/run/run.c
View File

@@ -264,14 +264,15 @@ static int help_sudo_mode(void) {
}
static bool become_root(void) {
return !arg_exec_user || STR_IN_SET(arg_exec_user, "root", "0");
}
static bool privileged_execution(void) {
if (arg_runtime_scope != RUNTIME_SCOPE_SYSTEM)
return false;
return become_root();
if (!arg_exec_user) {
assert(!arg_empower); /* assume default user has been set */
return true;
}
return STR_IN_SET(arg_exec_user, "root", "0");
}
static int add_timer_property(const char *name, const char *val) {
@@ -885,7 +886,7 @@ static int parse_argv(int argc, char *argv[]) {
}
static double shell_prompt_hue(void) {
if (privileged_execution())
if (become_root())
return 0; /* red */
if (arg_empower)
@@ -895,7 +896,7 @@ static double shell_prompt_hue(void) {
}
static Glyph shell_prompt_glyph(void) {
if (privileged_execution())
if (become_root())
return GLYPH_SUPERHERO;
if (arg_empower)
@@ -905,7 +906,7 @@ static Glyph shell_prompt_glyph(void) {
}
static Glyph pty_window_glyph(void) {
if (privileged_execution())
if (become_root())
return GLYPH_RED_CIRCLE;
if (arg_empower)
@@ -1295,10 +1296,10 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
* default. Note that pam_logind/systemd-logind doesn't distinguish between run0-style privilege
* escalation on a TTY and first class (getty-style) TTY logins (and thus gives root a per-session
* manager for interactive TTY sessions), hence let's override the logic explicitly here. We only do
* this for root though, under the assumption that if a regular user temporarily transitions into
* another regular user it's a better default that the full user environment is uniformly
* available. */
if (arg_lightweight < 0 && (privileged_execution() || arg_empower))
* this for root or --empower though, under the assumption that if a regular user temporarily
* transitions into another regular user it's a better default that the full user environment is
* uniformly available. */
if (arg_lightweight < 0 && (become_root() || arg_empower))
arg_lightweight = true;
if (arg_lightweight >= 0) {