From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Nov 2013 23:49:19 +0000 (+0100)
Subject: bus: dbus-daemons' access messages are a bit too verbose
X-Git-Tag: v209~1667
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c9b6cb28c35e18649575b82466d7d6eb29aa5196;p=elogind.git

bus: dbus-daemons' access messages are a bit too verbose
---

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);
 }