This is a followup to: commit 1a37b9b9043ef83e9900e460a9a1fccced3acf89 It will fix denial messages from dbus-daemon between gdm and systemd-logind on logging into GNOME due to this.
See the previous commit for more details. --- src/core/dbus-job.c | 4 ++-- src/core/dbus-manager.c | 2 +- src/core/dbus-snapshot.c | 2 +- src/core/dbus-unit.c | 6 +++--- src/core/dbus.c | 2 +- src/hostname/hostnamed.c | 2 +- src/locale/localed.c | 2 +- src/login/logind-seat-dbus.c | 2 +- src/login/logind-session-dbus.c | 2 +- src/login/logind-user-dbus.c | 2 +- src/timedate/timedated.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-)
>From 26475f77c3f2eb938972d85df386576cea88be1c Mon Sep 17 00:00:00 2001 From: Colin Walters <[email protected]> Date: Mon, 18 Mar 2013 09:32:47 -0400 Subject: [PATCH 1/2] Use bus_maybe_send_reply() where applicable This is a followup to: commit 1a37b9b9043ef83e9900e460a9a1fccced3acf89 It will fix denial messages from dbus-daemon between gdm and systemd-logind on logging into GNOME due to this. See the previous commit for more details. --- src/core/dbus-job.c | 4 ++-- src/core/dbus-manager.c | 2 +- src/core/dbus-snapshot.c | 2 +- src/core/dbus-unit.c | 6 +++--- src/core/dbus.c | 2 +- src/hostname/hostnamed.c | 2 +- src/locale/localed.c | 2 +- src/login/logind-seat-dbus.c | 2 +- src/login/logind-session-dbus.c | 2 +- src/login/logind-user-dbus.c | 2 +- src/timedate/timedated.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 20c2a62..096542b 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -116,7 +116,7 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; @@ -185,7 +185,7 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu free(introspection); - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 8f4bbc5..75a341f 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1894,7 +1894,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, } if (reply) - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c index 02cfcb1..2ae8574 100644 --- a/src/core/dbus-snapshot.c +++ b/src/core/dbus-snapshot.c @@ -77,7 +77,7 @@ DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusM return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (!dbus_connection_send(c, reply, NULL)) + if (!bus_maybe_send_reply(c, message, reply)) return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 7c23e1e..dc7d1f1 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -582,7 +582,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn } if (reply) - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; @@ -673,7 +673,7 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB free(introspection); - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; @@ -886,7 +886,7 @@ DBusHandlerResult bus_unit_queue_job( DBUS_TYPE_INVALID)) goto oom; - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus.c b/src/core/dbus.c index 08aff1f..236ebc9 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -406,7 +406,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus dbus_error_free(&error); if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 979dcfd..25e154b 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -605,7 +605,7 @@ static DBusHandlerResult hostname_message_handler( if (!reply) goto oom; - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/locale/localed.c b/src/locale/localed.c index 4f85b8b..60083b7 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -1277,7 +1277,7 @@ static DBusHandlerResult locale_message_handler( if (!(reply = dbus_message_new_method_return(message))) goto oom; - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index 7833d70..4da076e 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -310,7 +310,7 @@ static DBusHandlerResult seat_message_dispatch( } if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index ef73cd4..c4db315 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -412,7 +412,7 @@ static DBusHandlerResult session_message_dispatch( } if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index ddf9d9d..5951c38 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -304,7 +304,7 @@ static DBusHandlerResult user_message_dispatch( } if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 7753493..85506f4 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -889,7 +889,7 @@ static DBusHandlerResult timedate_message_handler( if (!(reply = dbus_message_new_method_return(message))) goto oom; - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); -- 1.7.1
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
