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.

11 files changed, 14 insertions, 14 deletions

diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index 20c2a6233..096542be3 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -113,13 +113,13 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec
                 };
 
                 SELINUX_UNIT_ACCESS_CHECK(j->unit, connection, message, "status");
                 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;
 }
 
 static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage  *message, void *data) {
@@ -182,13 +182,13 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu
                                 free(introspection);
                                 goto oom;
                         }
 
                         free(introspection);
 
-                        if (!dbus_connection_send(connection, reply, NULL))
+                        if (!bus_maybe_send_reply(connection, message, reply))
                                 goto oom;
 
                         return DBUS_HANDLER_RESULT_HANDLED;
                 }
 
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 8f4bbc59b..75a341fce 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1891,13 +1891,13 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                         return bus_send_error_reply(connection, message, &error, r);
 
                 return bus_unit_queue_job(connection, message, u, job_type, mode, reload_if_possible);
         }
 
         if (reply)
-                if (!dbus_connection_send(connection, reply, NULL))
+                if (!bus_maybe_send_reply(connection, message, reply))
                         goto oom;
 
         return DBUS_HANDLER_RESULT_HANDLED;
 
 oom:
         dbus_error_free(&error);
diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c
index 02cfcb182..2ae8574f5 100644
--- a/src/core/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
@@ -74,11 +74,11 @@ DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusM
 
                 SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
 
                 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 7c23e1e61..dc7d1f13f 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -579,13 +579,13 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn
                 }
 
                 return bus_unit_queue_job(connection, message, u, job_type, mode, reload_if_possible);
         }
 
         if (reply)
-                if (!dbus_connection_send(connection, reply, NULL))
+                if (!bus_maybe_send_reply(connection, message, reply))
                         goto oom;
 
         return DBUS_HANDLER_RESULT_HANDLED;
 
 oom:
         dbus_error_free(&error);
@@ -670,13 +670,13 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB
                                 free(introspection);
                                 goto oom;
                         }
 
                         free(introspection);
 
-                        if (!dbus_connection_send(connection, reply, NULL))
+                        if (!bus_maybe_send_reply(connection, message, reply))
                                 goto oom;
 
                         return DBUS_HANDLER_RESULT_HANDLED;
                 }
 
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -883,13 +883,13 @@ DBusHandlerResult bus_unit_queue_job(
         if (!dbus_message_append_args(
                             reply,
                             DBUS_TYPE_OBJECT_PATH, &path,
                             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;
 
 oom:
         dbus_error_free(&error);
diff --git a/src/core/dbus.c b/src/core/dbus.c
index 08aff1fd2..236ebc99d 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -403,13 +403,13 @@ 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);
         }
 
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 979dcfdc7..25e154b22 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -602,13 +602,13 @@ static DBusHandlerResult hostname_message_handler(
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
 
         reply = dbus_message_new_method_return(message);
         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);
         reply = NULL;
 
         if (changed) {
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 4f85b8b58..60083b768 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1274,13 +1274,13 @@ static DBusHandlerResult locale_message_handler(
         } else
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
 
         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);
         reply = NULL;
 
         if (changed) {
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 7833d70a0..4da076e36 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -307,13 +307,13 @@ static DBusHandlerResult seat_message_dispatch(
                         { NULL, }
                 };
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
         }
 
         if (reply) {
-                if (!dbus_connection_send(connection, reply, NULL))
+                if (!bus_maybe_send_reply(connection, message, reply))
                         goto oom;
 
                 dbus_message_unref(reply);
         }
 
         return DBUS_HANDLER_RESULT_HANDLED;
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index ef73cd434..c4db31553 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -409,13 +409,13 @@ static DBusHandlerResult session_message_dispatch(
                         { NULL, }
                 };
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
         }
 
         if (reply) {
-                if (!dbus_connection_send(connection, reply, NULL))
+                if (!bus_maybe_send_reply(connection, message, reply))
                         goto oom;
 
                 dbus_message_unref(reply);
         }
 
         return DBUS_HANDLER_RESULT_HANDLED;
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index ddf9d9d5c..5951c38cb 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -301,13 +301,13 @@ static DBusHandlerResult user_message_dispatch(
                 };
 
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
         }
 
         if (reply) {
-                if (!dbus_connection_send(connection, reply, NULL))
+                if (!bus_maybe_send_reply(connection, message, reply))
                         goto oom;
 
                 dbus_message_unref(reply);
         }
 
         return DBUS_HANDLER_RESULT_HANDLED;
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 77534933c..85506f4fc 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -886,13 +886,13 @@ static DBusHandlerResult timedate_message_handler(
         } else
                 return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
 
         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);
         reply = NULL;
 
         if (changed) {