-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#include <dbus/dbus.h>
+#include <stdlib.h>
+
#include "log.h"
+#include "dbus-common.h"
int main(int argc, char *argv[]) {
DBusError error;
DBusConnection *bus = NULL;
DBusMessage *m = NULL;
- int r = 1;
+ int r = EXIT_FAILURE;
dbus_error_init(&error);
goto finish;
}
- if (!(bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) {
- log_error("Failed to get D-Bus connection: %s", error.message);
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ 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 LEGACY
+ 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 LEGACY
+ }
+#endif
+
+ if (bus_check_peercred(bus) < 0) {
+ log_error("Bus owner not root.");
goto finish;
}
}
if (!dbus_connection_send(bus, m, NULL)) {
- log_error("Failed to send signal message.");
+ log_error("Failed to send signal message on private connection.");
goto finish;
}
- r = 0;
+ r = EXIT_SUCCESS;
finish:
- if (bus)
+ if (bus) {
+ dbus_connection_flush(bus);
+ dbus_connection_close(bus);
dbus_connection_unref(bus);
+ }
if (m)
dbus_message_unref(m);