From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 26 Sep 2017 14:18:50 +0000 (+0200)
Subject: core: improve dbus-cgroup error message
X-Git-Tag: v235~54^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fe66c868143f891bc2f04b3d8ea239a590ef740;p=thirdparty%2Fsystemd.git

core: improve dbus-cgroup error message

As suggested by @keszybz in the review of #6764
---

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index f61ca08fcba..a99d727f4d6 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;