From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 9 Apr 2025 10:50:03 +0000 (+0200)
Subject: exec-invoke: Fix two log messages
X-Git-Tag: v258-rc1~858^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad04dc4116b429141ca88cb6eb578df1937b7ac7;p=thirdparty%2Fsystemd.git

exec-invoke: Fix two log messages
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index ef501607b69..7e2cdd8c46c 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -1854,7 +1854,7 @@ static int apply_protect_hostname(const ExecContext *c, const ExecParameters *p,
         }
 #endif
 
-        return 0;
+        return 1;
 }
 
 static void do_idle_pipe_dance(int idle_pipe[static 4]) {
@@ -4451,8 +4451,8 @@ static int setup_delegated_namespaces(
                 r = apply_protect_hostname(context, params, reterr_exit_status);
                 if (r < 0)
                         return r;
-
-                log_exec_debug(context, params, "Set up %sUTS namespace", delegate ? "delegated " : "");
+                if (r > 0)
+                        log_exec_debug(context, params, "Set up %sUTS namespace", delegate ? "delegated " : "");
         }
 
         return 0;
@@ -5467,8 +5467,8 @@ int exec_invoke(
                         *exit_status = EXIT_USER;
                         return log_exec_error_errno(context, params, r, "Failed to set up user namespacing: %m");
                 }
-
-                log_debug("Set up privileged user namespace");
+                if (r > 0)
+                        log_debug("Set up privileged user namespace");
         }
 
         /* Call setup_delegated_namespaces() the second time to unshare all delegated namespaces. */