unit: when reading description from LSB prefer short over long description

[elogind.git] / src / initctl.c

diff --git a/src/initctl.c b/src/initctl.c
index def621d220298568fc1782fcca8b55b16e3f4e1f..a18cf384a473121dcc9064423684ff5b1173ca74 100644 (file)
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -290,13 +290,13 @@ static int server_init(Server *s, unsigned n_sockets) {
                         goto fail;
                 }
 
-                f->fd = SD_LISTEN_FDS_START+i;
+                f->fd = fd;
                 LIST_PREPEND(Fifo, fifo, s->fifos, f);
                 f->server = s;
                 s->n_fifos ++;
         }
 
-        if (!(s->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) {
+        if (!(s->bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
                 log_error("Failed to get D-Bus connection: %s", error.message);
                 goto fail;
         }
@@ -336,6 +336,16 @@ int main(int argc, char *argv[]) {
         Server server;
         int r = 3, n;
 
+        if (getppid() != 1) {
+                log_error("This program should be invoked by init only.");
+                return 1;
+        }
+
+        if (argc > 1) {
+                log_error("This program does not take arguments.");
+                return 1;
+        }
+
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();