From 9c74286dee3c181008c5ce41e473bb1b164b385a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 3 Mar 2014 15:59:10 +0000 Subject: [PATCH 1/3] .gitignore: ignore /test-driver, generated by recent Automake (cherry picked from commit 1895a8ee5b0e3813b571e9db3528611802ea7f7e) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index db3db97f..90de1394 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ tags /lcov.html/ /lcov.info /lcov.info.tmp +/test-driver From 5d4900ad1635db2923d343c0373b6e2878082e53 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 3 Jul 2015 13:50:04 +0100 Subject: [PATCH 2/3] dbus-monitor: disable automatic handling of o.fd.Peer messages A normal DBusConnection will automatically reply to o.fd.Peer messages such as Ping. We don't want this: we'll confuse everyone else by replying to messages that weren't intended for us. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90952 Signed-off-by: Simon McVittie Reviewed-by: Philip Withnall (cherry picked from commit d9ee040d0bff2b421bca80c2339dcd9347d906db, commit message adjusted to describe the impact in versions < 1.9) Conflicts: tools/dbus-monitor.c --- tools/dbus-monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index ff8390d7..85fd738a 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -365,6 +365,11 @@ main (int argc, char *argv[]) exit (1); } + /* Receive o.fd.Peer messages as normal messages, rather than having + * libdbus handle them internally, which is the wrong thing for + * a monitor */ + dbus_connection_set_route_peer_messages (connection, TRUE); + if (numFilters) { size_t offset = 0; From e5ed2e2105617a9752d3807ebd5909db255b0526 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 21 Jul 2015 17:19:25 +0100 Subject: [PATCH 3/3] NEWS for 1.8.x --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 9749a340..d323c003 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,9 @@ Fixes: • Fix a memory leak when GetConnectionCredentials() succeeds (fd.o #91008, Jacek Bukarewicz) +• Ensure that dbus-monitor does not reply to messages intended for others + (fd.o #90952, Simon McVittie) + D-Bus 1.8.18 (2015-05-14) ==