From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2024 12:33:38 +0000 (+0200)
Subject: manager: move is-system check into manager_enable_special_signals()
X-Git-Tag: v257-rc1~920
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eedec7307dd5d1f4f4ad1b61b01e7283856388b;p=thirdparty%2Fsystemd.git

manager: move is-system check into manager_enable_special_signals()

It's usually how we do this: make the functions robust to be called in
any context, and validate the context in the functions themselves early,
instead of in the caller.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index f5588380d63..1504d3fd7de 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -477,12 +477,12 @@ static int manager_setup_timezone_change(Manager *m) {
         return 0;
 }
 
-static int enable_special_signals(Manager *m) {
+static int manager_enable_special_signals(Manager *m) {
         _cleanup_close_ int fd = -EBADF;
 
         assert(m);
 
-        if (MANAGER_IS_TEST_RUN(m))
+        if (!MANAGER_IS_SYSTEM(m) || MANAGER_IS_TEST_RUN(m))
                 return 0;
 
         /* Enable that we get SIGINT on control-alt-del. In containers this will fail with EPERM (older) or
@@ -608,10 +608,7 @@ static int manager_setup_signals(Manager *m) {
         (void) sd_notify(/* unset_environment= */ false,
                          "X_SYSTEMD_SIGNALS_LEVEL=2");
 
-        if (MANAGER_IS_SYSTEM(m))
-                return enable_special_signals(m);
-
-        return 0;
+        return manager_enable_special_signals(m);
 }
 
 static char** sanitize_environment(char **l) {