From 0d298a771a628e110a8ae9c8ad265b5d3cb28cd2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 15 Dec 2024 10:00:06 +0900 Subject: [PATCH] core/exec-invoke: fix ProtectHostname= value in log message Follow-up for cf48bde7aea52b18ac3fa218d3f60fd3d533ef66. --- src/core/exec-invoke.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 8af0addcc9..fe1ee884da 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -1708,22 +1708,17 @@ static int apply_protect_hostname(const ExecContext *c, const ExecParameters *p, if (unshare(CLONE_NEWUTS) < 0) { if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno)) { *ret_exit_status = EXIT_NAMESPACE; - return log_exec_error_errno(c, - p, - errno, - "Failed to set up UTS namespacing: %m"); + return log_exec_error_errno(c, p, errno, "Failed to set up UTS namespacing: %m"); } - log_exec_warning(c, - p, - "ProtectHostname=yes is configured, but UTS namespace setup is " - "prohibited (container manager?), ignoring namespace setup."); + log_exec_warning(c, p, + "ProtectHostname=%s is configured, but UTS namespace setup is prohibited (container manager?), ignoring namespace setup.", + protect_hostname_to_string(c->protect_hostname)); } } else - log_exec_warning(c, - p, - "ProtectHostname=yes is configured, but the kernel does not " - "support UTS namespaces, ignoring namespace setup."); + log_exec_warning(c, p, + "ProtectHostname=%s is configured, but the kernel does not support UTS namespaces, ignoring namespace setup.", + protect_hostname_to_string(c->protect_hostname)); #if HAVE_SECCOMP if (c->protect_hostname == PROTECT_HOSTNAME_YES) {