From c9b6cb28c35e18649575b82466d7d6eb29aa5196 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 5 Nov 2013 00:49:19 +0100 Subject: [PATCH 1/1] bus: dbus-daemons' access messages are a bit too verbose --- src/libsystemd-bus/bus-error.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-bus/bus-error.c b/src/libsystemd-bus/bus-error.c index c347b101b..35e261464 100644 --- a/src/libsystemd-bus/bus-error.c +++ b/src/libsystemd-bus/bus-error.c @@ -448,11 +448,18 @@ int sd_bus_error_set_errnof(sd_bus_error *e, int error, const char *format, ...) const char *bus_error_message(const sd_bus_error *e, int error) { + if (e) { + /* Sometimes the D-Bus server is a little bit too verbose with + * its error messages, so let's override them here */ + if (sd_bus_error_has_name(e, SD_BUS_ERROR_ACCESS_DENIED)) + return "Access denied"; + + if (e->message) + return e->message; + } + if (error < 0) error = -error; - if (e && e->message) - return e->message; - return strerror(error); } -- 2.30.2