X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroups-agent%2Fcgroups-agent.c;h=cca5cec3df887fb13fbba1bf8b1499a2bce6feee;hp=0e3d2b75415637560cd42f52cb6d2ab628b57d59;hb=c0f6bb301e2d228d6be93f925e6178994aabaa41;hpb=286ca4852eb2efc5c8c405e585b4e886c538f538
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 0e3d2b754..cca5cec3d 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -19,83 +19,44 @@
along with systemd; If not, see .
***/
-#include
-
#include
+#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);
log_parse_environment();
log_open();
- /* We send this event to the private D-Bus socket and then the
- * system instance will forward this to the system bus. We do
- * 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;
- }
-
- 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;
+ /* Unlike in systemd where this has to use a private socket,
+ since logind doesn't associate control groups with services
+ and doesn't manage the dbus service, we can just use the
+ system bus. */
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ log_debug_errno(r, "Failed to open system bus: %m");
+ return EXIT_FAILURE;
}
- if (!dbus_connection_send(bus, m, NULL)) {
- log_error("Failed to send signal message on private connection.");
- 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: %m");
+ return EXIT_FAILURE;
}
- 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;
}