chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
90e071d
)
bus: dbus-daemons' access messages are a bit too verbose
author
Lennart Poettering
<lennart@poettering.net>
Mon, 4 Nov 2013 23:49:19 +0000
(
00:49
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Nov 2013 00:13:05 +0000
(
01:13
+0100)
src/libsystemd-bus/bus-error.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/bus-error.c
b/src/libsystemd-bus/bus-error.c
index c347b101bc479e809478ea063d6f687ecf5ffd26..35e261464067abfe8c18807fcfeaaa4b4f0cc5c5 100644
(file)
--- 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);
}