Prep v225: Applying various fixes and changes to src/cgroups-agent that got lost...

[elogind.git] / src / cgroups-agent / cgroups-agent.c

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 0e3d2b75415637560cd42f52cb6d2ab628b57d59..612bc8fdec7ad9f8ca7b8a32ebd27a804108a76e 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -19,24 +19,19 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dbus/dbus.h>
-
 #include <stdlib.h>
 
+#include "sd-bus.h"
 #include "log.h"
-#include "dbus-common.h"
+#include "bus-util.h"
 
 int main(int argc, char *argv[]) {
-        DBusError error;
-        DBusConnection *bus = NULL;
-        DBusMessage *m = NULL;
-        int r = EXIT_FAILURE;
-
-        dbus_error_init(&error);
+        _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
+        int r;
 
         if (argc != 2) {
                 log_error("Incorrect number of arguments.");
-                goto finish;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_AUTO);
@@ -48,54 +43,24 @@ int main(int argc, char *argv[]) {
          * this to avoid an activation loop when we start dbus when we
          * are called when the dbus service is shut down. */
 
-        if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
-#ifndef NOLEGACY
-                dbus_error_free(&error);
-
-                /* Retry with the pre v21 socket name, to ease upgrades */
-                if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
-#endif
-                        log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
-                        goto finish;
-                }
-#ifndef NOLEGACY
-        }
-#endif
-
-        if (bus_check_peercred(bus) < 0) {
-                log_error("Bus owner not root.");
-                goto finish;
-        }
-
-        if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) {
-                log_error("Could not allocate signal message.");
-                goto finish;
+        r = bus_open_system_systemd(&bus);
+        if (r < 0) {
+                /* If we couldn't connect we assume this was triggered
+                 * while systemd got restarted/transitioned from
+                 * initrd to the system, so let's ignore this */
+                log_debug_errno(r, "Failed to get D-Bus connection: %m");
+                return EXIT_FAILURE;
         }
 
-        if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &argv[1],
-                                      DBUS_TYPE_INVALID)) {
-                log_error("Could not attach group information to signal message.");
-                goto finish;
+        r = sd_bus_emit_signal(bus,
+                               "/org/freedesktop/systemd1/agent",
+                               "org.freedesktop.systemd1.Agent",
+                               "Released",
+                               "s", argv[1]);
+        if (r < 0) {
+                log_debug_errno(r, "Failed to send signal message on private connection: %m");
+                return EXIT_FAILURE;
         }
 
-        if (!dbus_connection_send(bus, m, NULL)) {
-                log_error("Failed to send signal message on private connection.");
-                goto finish;
-        }
-
-        r = EXIT_SUCCESS;
-
-finish:
-        if (bus) {
-                dbus_connection_flush(bus);
-                dbus_connection_close(bus);
-                dbus_connection_unref(bus);
-        }
-
-        if (m)
-                dbus_message_unref(m);
-
-        dbus_error_free(&error);
-        return r;
+        return EXIT_SUCCESS;
 }