diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-01-01 23:48:13 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-01-01 23:48:13 +0000 |
commit | ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c (patch) | |
tree | 8697326f4c120119e825b82f96bd239002de3712 /bus/stats.c | |
parent | fda9d8a44aa1bde4f2777fb9ad8650f45820fb6b (diff) | |
parent | abbbf449f17e0a74a5d9a50fb5b074e96e9b7030 (diff) | |
download | dbus-ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c.tar.gz |
Merge branch 'dbus-1.8' and prepare 1.9.6dbus-1.9.6
Conflicts:
NEWS
configure.ac
test/dbus-daemon.c
Diffstat (limited to 'bus/stats.c')
-rw-r--r-- | bus/stats.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bus/stats.c b/bus/stats.c index 859c6a52..dace0e29 100644 --- a/bus/stats.c +++ b/bus/stats.c @@ -29,6 +29,7 @@ #include <dbus/dbus-connection-internal.h> #include "connection.h" +#include "driver.h" #include "services.h" #include "signals.h" #include "utils.h" @@ -50,6 +51,9 @@ bus_stats_handle_get_stats (DBusConnection *connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + if (!bus_driver_check_message_is_for_us (message, error)) + return FALSE; + context = bus_transaction_get_context (transaction); connections = bus_context_get_connections (context); @@ -132,6 +136,9 @@ bus_stats_handle_get_connection_stats (DBusConnection *caller_connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + if (!bus_driver_check_message_is_for_us (message, error)) + return FALSE; + registry = bus_connection_get_registry (caller_connection); if (! dbus_message_get_args (message, error, |