chiark / gitweb /
update TODO
[elogind.git] / src / update-utmp / update-utmp.c
index ec07b92..15da831 100644 (file)
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <dbus/dbus.h>
-
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif
 
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif
 
+#include "sd-bus.h"
+
 #include "log.h"
 #include "macro.h"
 #include "util.h"
 #include "special.h"
 #include "utmp-wtmp.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
 #include "special.h"
 #include "utmp-wtmp.h"
-#include "dbus-common.h"
+#include "bus-util.h"
+#include "bus-error.h"
+#include "unit-name.h"
 
 typedef struct Context {
 
 typedef struct Context {
-        DBusConnection *bus;
+        sd_bus *bus;
 #ifdef HAVE_AUDIT
         int audit_fd;
 #endif
 } Context;
 
 static usec_t get_startup_time(Context *c) {
 #ifdef HAVE_AUDIT
         int audit_fd;
 #endif
 } Context;
 
 static usec_t get_startup_time(Context *c) {
-        const char
-                *interface = "org.freedesktop.systemd1.Manager",
-                *property = "StartupTimestamp";
-
-        DBusError error;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         usec_t t = 0;
         usec_t t = 0;
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusMessageIter iter, sub;
-
-        dbus_error_init(&error);
+        int r;
 
         assert(c);
 
 
         assert(c);
 
-        if (!(m = dbus_message_new_method_call(
-                              "org.freedesktop.systemd1",
-                              "/org/freedesktop/systemd1",
-                              "org.freedesktop.DBus.Properties",
-                              "Get"))) {
-                log_error("Could not allocate message.");
-                goto finish;
-        }
-
-        if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &interface,
-                                      DBUS_TYPE_STRING, &property,
-                                      DBUS_TYPE_INVALID)) {
-                log_error("Could not append arguments to message.");
-                goto finish;
-        }
-
-        if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
-                log_error("Failed to send command: %s", bus_error_message(&error));
-                goto finish;
-        }
-
-        if (!dbus_message_iter_init(reply, &iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)  {
-                log_error("Failed to parse reply.");
-                goto finish;
-        }
-
-        dbus_message_iter_recurse(&iter, &sub);
-
-        if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_UINT64)  {
-                log_error("Failed to parse reply.");
-                goto finish;
+        r = sd_bus_get_property_trivial(
+                        c->bus,
+                        "org.freedesktop.systemd1",
+                        "/org/freedesktop/systemd1",
+                        "org.freedesktop.systemd1.Manager",
+                        "UserspaceTimestamp",
+                        &error,
+                        't', &t);
+        if (r < 0) {
+                log_error("Failed to get timestamp: %s", bus_error_message(&error, -r));
+                return 0;
         }
 
         }
 
-        dbus_message_iter_get_basic(&sub, &t);
-
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        dbus_error_free(&error);
-
         return t;
 }
 
         return t;
 }
 
@@ -122,121 +84,40 @@ static int get_current_runlevel(Context *c) {
                 { '3', SPECIAL_RUNLEVEL3_TARGET },
                 { '4', SPECIAL_RUNLEVEL4_TARGET },
                 { '2', SPECIAL_RUNLEVEL2_TARGET },
                 { '3', SPECIAL_RUNLEVEL3_TARGET },
                 { '4', SPECIAL_RUNLEVEL4_TARGET },
                 { '2', SPECIAL_RUNLEVEL2_TARGET },
-                { 'S', SPECIAL_RESCUE_TARGET },
+                { '1', SPECIAL_RESCUE_TARGET },
         };
         };
-        const char
-                *interface = "org.freedesktop.systemd1.Unit",
-                *property = "ActiveState";
 
 
-        DBusMessage *m = NULL, *reply = NULL;
-        int r = 0;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        int r;
         unsigned i;
         unsigned i;
-        DBusError error;
 
         assert(c);
 
 
         assert(c);
 
-        dbus_error_init(&error);
-
         for (i = 0; i < ELEMENTSOF(table); i++) {
         for (i = 0; i < ELEMENTSOF(table); i++) {
-                const char *path = NULL, *state;
-                DBusMessageIter iter, sub;
-
-                if (!(m = dbus_message_new_method_call(
-                                      "org.freedesktop.systemd1",
-                                      "/org/freedesktop/systemd1",
-                                      "org.freedesktop.systemd1.Manager",
-                                      "GetUnit"))) {
-                        log_error("Could not allocate message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &table[i].special,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
-                        dbus_error_free(&error);
-                        continue;
+                _cleanup_free_ char *state = NULL, *path = NULL;
+
+                path = unit_dbus_path_from_name(table[i].special);
+                if (!path)
+                        return log_oom();
+
+                r = sd_bus_get_property_string(
+                                c->bus,
+                                "org.freedesktop.systemd1",
+                                path,
+                                "org.freedesktop.systemd1.Unit",
+                                "ActiveState",
+                                &error,
+                                &state);
+                if (r < 0) {
+                        log_warning("Failed to get state: %s", bus_error_message(&error, -r));
+                        return r;
                 }
 
                 }
 
-                if (!dbus_message_get_args(reply, &error,
-                                           DBUS_TYPE_OBJECT_PATH, &path,
-                                           DBUS_TYPE_INVALID)) {
-                        log_error("Failed to parse reply: %s", bus_error_message(&error));
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_unref(m);
-                if (!(m = dbus_message_new_method_call(
-                                      "org.freedesktop.systemd1",
-                                      path,
-                                      "org.freedesktop.DBus.Properties",
-                                      "Get"))) {
-                        log_error("Could not allocate message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &interface,
-                                              DBUS_TYPE_STRING, &property,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                dbus_message_unref(reply);
-                if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
-                        log_error("Failed to send command: %s", bus_error_message(&error));
-                        r = -EIO;
-                        goto finish;
-                }
-
-                if (!dbus_message_iter_init(reply, &iter) ||
-                    dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)  {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&iter, &sub);
-
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING)  {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_get_basic(&sub, &state);
-
                 if (streq(state, "active") || streq(state, "reloading"))
                 if (streq(state, "active") || streq(state, "reloading"))
-                        r = table[i].runlevel;
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-
-                if (r)
-                        break;
+                        return table[i].runlevel;
         }
 
         }
 
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        dbus_error_free(&error);
-
-        return r;
+        return 0;
 }
 
 static int on_reboot(Context *c) {
 }
 
 static int on_reboot(Context *c) {
@@ -250,8 +131,9 @@ static int on_reboot(Context *c) {
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0)
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0)
-                if (audit_log_user_message(c->audit_fd, AUDIT_SYSTEM_BOOT, "init", NULL, NULL, NULL, 1) < 0) {
-                        log_error("Failed to send audit message: %m");
+                if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_BOOT, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
+                    errno != EPERM) {
+                        log_error_errno(errno, "Failed to send audit message: %m");
                         r = -errno;
                 }
 #endif
                         r = -errno;
                 }
 #endif
@@ -260,8 +142,9 @@ static int on_reboot(Context *c) {
          * utmp_put_reboot() will then fix to the current time */
         t = get_startup_time(c);
 
          * utmp_put_reboot() will then fix to the current time */
         t = get_startup_time(c);
 
-        if ((q = utmp_put_reboot(t)) < 0) {
-                log_error("Failed to write utmp record: %s", strerror(-q));
+        q = utmp_put_reboot(t);
+        if (q < 0) {
+                log_error_errno(q, "Failed to write utmp record: %m");
                 r = q;
         }
 
                 r = q;
         }
 
@@ -278,14 +161,16 @@ static int on_shutdown(Context *c) {
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0)
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0)
-                if (audit_log_user_message(c->audit_fd, AUDIT_SYSTEM_SHUTDOWN, "init", NULL, NULL, NULL, 1) < 0) {
-                        log_error("Failed to send audit message: %m");
+                if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_SHUTDOWN, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
+                    errno != EPERM) {
+                        log_error_errno(errno, "Failed to send audit message: %m");
                         r = -errno;
                 }
 #endif
 
                         r = -errno;
                 }
 #endif
 
-        if ((q = utmp_put_shutdown()) < 0) {
-                log_error("Failed to write utmp record: %s", strerror(-q));
+        q = utmp_put_shutdown();
+        if (q < 0) {
+                log_error_errno(q, "Failed to write utmp record: %m");
                 r = q;
         }
 
                 r = q;
         }
 
@@ -301,21 +186,19 @@ static int on_runlevel(Context *c) {
          * utmp record and send the audit msg */
 
         /* First, get last runlevel */
          * utmp record and send the audit msg */
 
         /* First, get last runlevel */
-        if ((q = utmp_get_runlevel(&previous, NULL)) < 0) {
+        q = utmp_get_runlevel(&previous, NULL);
 
 
-                if (q != -ESRCH && q != -ENOENT) {
-                        log_error("Failed to get current runlevel: %s", strerror(-q));
-                        return q;
-                }
+        if (q < 0) {
+                if (q != -ESRCH && q != -ENOENT)
+                        return log_error_errno(q, "Failed to get current runlevel: %m");
 
 
-                /* Hmm, we didn't find any runlevel, that means we
-                 * have been rebooted */
-                r = on_reboot(c);
                 previous = 0;
         }
 
         /* Secondly, get new runlevel */
                 previous = 0;
         }
 
         /* Secondly, get new runlevel */
-        if ((runlevel = get_current_runlevel(c)) < 0)
+        runlevel = get_current_runlevel(c);
+
+        if (runlevel < 0)
                 return runlevel;
 
         if (previous == runlevel)
                 return runlevel;
 
         if (previous == runlevel)
@@ -323,24 +206,24 @@ static int on_runlevel(Context *c) {
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0) {
 
 #ifdef HAVE_AUDIT
         if (c->audit_fd >= 0) {
-                char *s = NULL;
+                _cleanup_free_ char *s = NULL;
 
                 if (asprintf(&s, "old-level=%c new-level=%c",
                              previous > 0 ? previous : 'N',
                              runlevel > 0 ? runlevel : 'N') < 0)
 
                 if (asprintf(&s, "old-level=%c new-level=%c",
                              previous > 0 ? previous : 'N',
                              runlevel > 0 ? runlevel : 'N') < 0)
-                        return -ENOMEM;
+                        return log_oom();
 
 
-                if (audit_log_user_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, NULL, NULL, NULL, 1) < 0) {
-                        log_error("Failed to send audit message: %m");
+                if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
+                    errno != EPERM) {
+                        log_error_errno(errno, "Failed to send audit message: %m");
                         r = -errno;
                 }
                         r = -errno;
                 }
-
-                free(s);
         }
 #endif
 
         }
 #endif
 
-        if ((q = utmp_put_runlevel(runlevel, previous)) < 0) {
-                log_error("Failed to write utmp record: %s", strerror(-q));
+        q = utmp_put_runlevel(runlevel, previous);
+        if (q < 0 && q != -ESRCH && q != -ENOENT) {
+                log_error_errno(q, "Failed to write utmp record: %m");
                 r = q;
         }
 
                 r = q;
         }
 
@@ -348,16 +231,12 @@ static int on_runlevel(Context *c) {
 }
 
 int main(int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        int r;
-        DBusError error;
-        Context c;
-
-        dbus_error_init(&error);
-
-        zero(c);
+        Context c = {
 #ifdef HAVE_AUDIT
 #ifdef HAVE_AUDIT
-        c.audit_fd = -1;
+                .audit_fd = -1
 #endif
 #endif
+        };
+        int r;
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
@@ -376,20 +255,20 @@ int main(int argc, char *argv[]) {
         umask(0022);
 
 #ifdef HAVE_AUDIT
         umask(0022);
 
 #ifdef HAVE_AUDIT
-        if ((c.audit_fd = audit_open()) < 0 &&
-            /* If the kernel lacks netlink or audit support,
-             * don't worry about it. */
-            errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
-                log_error("Failed to connect to audit log: %m");
+        /* If the kernel lacks netlink or audit support,
+         * don't worry about it. */
+        c.audit_fd = audit_open();
+        if (c.audit_fd < 0 && errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
+                log_error_errno(errno, "Failed to connect to audit log: %m");
 #endif
 #endif
-
-        if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
-                log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
+        r = bus_open_system_systemd(&c.bus);
+        if (r < 0) {
+                log_error_errno(r, "Failed to get D-Bus connection: %m");
                 r = -EIO;
                 goto finish;
         }
 
                 r = -EIO;
                 goto finish;
         }
 
-        log_debug("systemd-update-utmp running as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-update-utmp running as pid "PID_FMT, getpid());
 
         if (streq(argv[1], "reboot"))
                 r = on_reboot(&c);
 
         if (streq(argv[1], "reboot"))
                 r = on_reboot(&c);
@@ -402,7 +281,7 @@ int main(int argc, char *argv[]) {
                 r = -EINVAL;
         }
 
                 r = -EINVAL;
         }
 
-        log_debug("systemd-update-utmp stopped as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-update-utmp stopped as pid "PID_FMT, getpid());
 
 finish:
 #ifdef HAVE_AUDIT
 
 finish:
 #ifdef HAVE_AUDIT
@@ -410,14 +289,8 @@ finish:
                 audit_close(c.audit_fd);
 #endif
 
                 audit_close(c.audit_fd);
 #endif
 
-        if (c.bus) {
-                dbus_connection_flush(c.bus);
-                dbus_connection_close(c.bus);
-                dbus_connection_unref(c.bus);
-        }
-
-        dbus_error_free(&error);
-        dbus_shutdown();
+        if (c.bus)
+                sd_bus_unref(c.bus);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }