From 52610b020c077ee769c6923249f7e6c4e99d2980 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 31 Aug 2017 17:07:16 +0900 Subject: [PATCH 1/2] systemctl: show capabilities in human readable format Follow-up for 21771f338d268e06dc9a10b9b08b14ff8217d4be. --- src/shared/bus-util.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index a7fafb9be5..ea29e1c0dd 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -39,6 +39,7 @@ #include "bus-label.h" #include "bus-message.h" #include "bus-util.h" +#include "cap-list.h" #include "cgroup-util.h" #include "def.h" #include "escape.h" @@ -758,6 +759,15 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b print_property(name, "%s", result); + } else if (STR_IN_SET(name, "CapabilityBoundingSet", "AmbientCapabilities")) { + _cleanup_free_ char *s = NULL; + + r = capability_set_to_string_alloc(u, &s); + if (r < 0) + return r; + + print_property(name, "%s", s); + } else if ((STR_IN_SET(name, "CPUWeight", "StartupCPUWeight", "IOWeight", "StartupIOWeight") && u == CGROUP_WEIGHT_INVALID) || (STR_IN_SET(name, "CPUShares", "StartupCPUShares") && u == CGROUP_CPU_SHARES_INVALID) || (STR_IN_SET(name, "BlockIOWeight", "StartupBlockIOWeight") && u == CGROUP_BLKIO_WEIGHT_INVALID) || From ae978b9f6c8b8e617cc00e232aebf2c220e17688 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 31 Aug 2017 17:02:33 +0900 Subject: [PATCH 2/2] bus-util: remove unnecessary initializations --- src/core/dbus-execute.c | 2 +- src/shared/bus-util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index ac7cd7fd0c..eb0af24450 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1917,7 +1917,7 @@ int bus_exec_context_set_transient_property( return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path); if (mode != UNIT_CHECK) { - char *buf = NULL; + char *buf; buf = strjoin(b ? "-" : "", path); if (!buf) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index ea29e1c0dd..48752c5fea 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -734,7 +734,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b print_property(name, "%s", format_timespan(timespan, sizeof(timespan), u, 0)); } else if (streq(name, "RestrictNamespaces")) { _cleanup_free_ char *s = NULL; - const char *result = NULL; + const char *result; if ((u & NAMESPACE_FLAGS_ALL) == 0) result = "yes"; @@ -751,7 +751,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b print_property(name, "%s", result); } else if (streq(name, "MountFlags")) { - const char *result = NULL; + const char *result; result = mount_propagation_flags_to_string(u); if (!result)