close_nointr_nofail(s->epoll_fd);
if (s->bus) {
- dbus_connection_set_exit_on_disconnect(s->bus, FALSE);
+ dbus_connection_close(s->bus);
dbus_connection_unref(s->bus);
}
}
s->n_fifos ++;
}
- if (!(s->bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
+ if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) {
log_error("Failed to get D-Bus connection: %s", error.message);
goto fail;
}
- if ((r = bus_check_peercred(s->bus)) < 0) {
- log_error("Bus connection failed peer credential check: %s", strerror(-r));
- goto fail;
- }
return 0;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();
- log_info("systemd-initctl running as pid %lu", (unsigned long) getpid());
-
if ((n = sd_listen_fds(true)) < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
return 1;
if (server_init(&server, (unsigned) n) < 0)
return 2;
+ log_debug("systemd-initctl running as pid %lu", (unsigned long) getpid());
+
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
if (k <= 0)
break;
- if ((k = process_event(&server, &event)) < 0)
+ if (process_event(&server, &event) < 0)
goto fail;
}
+
r = 0;
+ log_debug("systemd-initctl stopped as pid %lu", (unsigned long) getpid());
+
fail:
sd_notify(false,
"STATUS=Shutting down...");
server_done(&server);
- log_info("systemd-initctl stopped as pid %lu", (unsigned long) getpid());
-
dbus_shutdown();
return r;