X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fupdate-utmp%2Fupdate-utmp.c;h=5e7498c9e2927c0633eb915876dfa93b18bdad3b;hp=42554fe2dcead4284727a4e0787ca13f7bee7b1b;hb=d5d8429a12c4b1ef0dcd226c0904f00f4fa4898a;hpb=5b30bef856e89a571df57b7b953e9a1409d9aced diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 42554fe2d..5e7498c9e 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -38,6 +38,7 @@ #include "utmp-wtmp.h" #include "bus-util.h" #include "bus-error.h" +#include "unit-name.h" typedef struct Context { sd_bus *bus; @@ -47,33 +48,25 @@ typedef struct Context { } Context; static usec_t get_startup_time(Context *c) { - usec_t t = 0; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + usec_t t = 0; int r; assert(c); - r = sd_bus_call_method( + r = sd_bus_get_property_trivial( c->bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", - "org.freedesktop.DBus.Properties", - "Get", - &error, - &reply, - "ss", "org.freedesktop.systemd1.Manager", - "UserspaceTimestamp"); + "UserspaceTimestamp", + &error, + 't', &t); if (r < 0) { log_error("Failed to get timestamp: %s", bus_error_message(&error, -r)); - return t; + return 0; } - r = sd_bus_message_read(reply, "v", "t", &t); - if (r < 0) - return bus_log_parse_error(r); - return t; } @@ -87,11 +80,9 @@ static int get_current_runlevel(Context *c) { * here over the others, since these are the main * runlevels used on Fedora. It might make sense to * change the order on some distributions. */ - { '5', SPECIAL_RUNLEVEL5_TARGET }, - { '3', SPECIAL_RUNLEVEL3_TARGET }, - { '4', SPECIAL_RUNLEVEL4_TARGET }, - { '2', SPECIAL_RUNLEVEL2_TARGET }, - { '1', SPECIAL_RESCUE_TARGET }, + { '5', SPECIAL_GRAPHICAL_TARGET }, + { '3', SPECIAL_MULTI_USER_TARGET }, + { '1', SPECIAL_RESCUE_TARGET }, }; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -101,48 +92,25 @@ static int get_current_runlevel(Context *c) { assert(c); for (i = 0; i < ELEMENTSOF(table); i++) { - _cleanup_bus_message_unref_ sd_bus_message *reply1 = NULL, *reply2 = NULL; - const char *path = NULL, *state; - - r = sd_bus_call_method( - c->bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "LoadUnit", - &error, - &reply1, - "s", table[i].special); - if (r < 0) { - log_error("Failed to get runlevel: %s", bus_error_message(&error, -r)); - if (r == -ENOMEM) - return r; - else - continue; - } + _cleanup_free_ char *state = NULL, *path = NULL; - r = sd_bus_message_read(reply1, "o", &path); - if (r < 0) - return bus_log_parse_error(r); + path = unit_dbus_path_from_name(table[i].special); + if (!path) + return log_oom(); - r = sd_bus_call_method( + r = sd_bus_get_property_string( c->bus, "org.freedesktop.systemd1", path, - "org.freedesktop.DBus.Properties", - "Get", + "org.freedesktop.systemd1.Unit", + "ActiveState", &error, - &reply2, - "ss", "org.freedesktop.systemd1.Unit", "ActiveState"); + &state); if (r < 0) { - log_error("Failed to get state: %s", bus_error_message(&error, -r)); + log_warning("Failed to get state: %s", bus_error_message(&error, -r)); return r; } - r = sd_bus_message_read(reply2, "v", "s", &state); - if (r < 0) - return bus_log_parse_error(r); - if (streq(state, "active") || streq(state, "reloading")) return table[i].runlevel; } @@ -161,9 +129,9 @@ static int on_reboot(Context *c) { #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 && + if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_BOOT, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM) { - log_error("Failed to send audit message: %m"); + log_error_errno(errno, "Failed to send audit message: %m"); r = -errno; } #endif @@ -172,8 +140,9 @@ static int on_reboot(Context *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; } @@ -190,15 +159,16 @@ static int on_shutdown(Context *c) { #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 && + if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_SHUTDOWN, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM) { - log_error("Failed to send audit message: %m"); + log_error_errno(errno, "Failed to send audit message: %m"); 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; } @@ -214,21 +184,19 @@ static int on_runlevel(Context *c) { * 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 */ - if ((runlevel = get_current_runlevel(c)) < 0) + runlevel = get_current_runlevel(c); + + if (runlevel < 0) return runlevel; if (previous == runlevel) @@ -236,40 +204,37 @@ static int on_runlevel(Context *c) { #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) - return -ENOMEM; + return log_oom(); - if (audit_log_user_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, NULL, NULL, NULL, 1) < 0 && + 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("Failed to send audit message: %m"); + log_error_errno(errno, "Failed to send audit message: %m"); r = -errno; } - - free(s); } #endif - if ((q = utmp_put_runlevel(runlevel, previous)) < 0) { - if (q != -ESRCH && q != -ENOENT) { - log_error("Failed to write utmp record: %s", strerror(-q)); - r = 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; } return r; } int main(int argc, char *argv[]) { - int r; - Context c = {}; - + Context c = { #ifdef HAVE_AUDIT - c.audit_fd = -1; + .audit_fd = -1 #endif + }; + int r; if (getppid() != 1) { log_error("This program should be invoked by init only."); @@ -288,20 +253,20 @@ int main(int argc, char *argv[]) { 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 r = bus_open_system_systemd(&c.bus); if (r < 0) { - log_error("Failed to get D-Bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to get D-Bus connection: %m"); 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); @@ -314,7 +279,7 @@ int main(int argc, char *argv[]) { 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