summaryrefslogtreecommitdiff
path: root/bus/bus.c
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2017-11-06 16:16:31 +0000
committerSimon McVittie <smcv@collabora.com>2017-11-10 16:21:07 +0000
commit56847ae818e8c144b9c7a8102efd1c926ead2f62 (patch)
treebf7f1427e820737893105dd9e6acd1a26c80c974 /bus/bus.c
parent293cbd03e3bf1301b863edb6be3cc616bb90a618 (diff)
downloaddbus-56847ae818e8c144b9c7a8102efd1c926ead2f62.tar.gz
bus_connections_setup_connection: If we can't set it up, log why
While reviewing fd.o#101354, Philip Withnall pointed out that if we rejected a connection in the new code there, we didn't log why. It turns out we didn't log that in the more normal code path either. Redo the error handling so that failure to set up a connection is logged. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103592
Diffstat (limited to 'bus/bus.c')
-rw-r--r--bus/bus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/bus/bus.c b/bus/bus.c
index 27a13ec9..f0f07f6c 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -172,10 +172,9 @@ new_connection_callback (DBusServer *server,
{
BusContext *context = data;
+ /* If this fails it logs a warning, so we don't need to do that */
if (!bus_connections_setup_connection (context->connections, new_connection))
{
- _dbus_verbose ("No memory to setup new connection\n");
-
/* if we don't do this, it will get unref'd without
* being disconnected... kind of strange really
* that we have to do this, people won't get it right