File 0027-core-improve-dbus-cgroup-error-message.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0027-core-improve-dbus-cgroup-error-message.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Currently displaying revision a47769d8fb254159c07462a5675e1695 , Show latest

From cc71a737c681ac28b54c9544deb1f59050c1750e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 26 Sep 2017 16:18:50 +0200
Subject: [PATCH 27/51] core: improve dbus-cgroup error message

As suggested by @keszybz in the review of #6764

(cherry picked from commit 4fe66c868143f891bc2f04b3d8ea239a590ef740)
---
 src/core/dbus-cgroup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index d3fc5f6e78..c7ebb6e37b 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -1247,7 +1247,7 @@ int bus_cgroup_set_property(
                                 return r;
 
                         if (!IN_SET(family, AF_INET, AF_INET6))
-                                return sd_bus_error_set_errnof(error, EINVAL, "IPAddressAllow= expects IPv4 or IPv6 addresses only.");
+                                return sd_bus_error_set_errnof(error, EINVAL, "%s= expects IPv4 or IPv6 addresses only.", name);
 
                         r = sd_bus_message_read_array(message, 'y', &ap, &an);
                         if (r < 0)
@@ -1262,7 +1262,7 @@ int bus_cgroup_set_property(
                                 return r;
 
                         if (prefixlen > FAMILY_ADDRESS_SIZE(family)*8)
-                                return sd_bus_error_set_errnof(error, EINVAL, "Prefix length too large for family.");
+                                return sd_bus_error_set_errnof(error, EINVAL, "Prefix length %" PRIu32 " too large for address family %s.", prefixlen, af_to_name(family));
 
                         if (mode != UNIT_CHECK) {
                                 IPAddressAccessItem *item;
-- 
2.16.4

Places

File 0027-core-improve-dbus-cgroup-error-message.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Places