X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fupdate-utmp%2Fupdate-utmp.c;h=5e2d2c60e600df57e31917a317c361339933601a;hb=9742b1e43855b1599bd52ff95af995d9a9d35eac;hp=5e7498c9e2927c0633eb915876dfa93b18bdad3b;hpb=d5d8429a12c4b1ef0dcd226c0904f00f4fa4898a;p=elogind.git
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 5e7498c9e..5e2d2c60e 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,10 +17,8 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
#include
#ifdef HAVE_AUDIT
@@ -31,15 +27,21 @@
#include "sd-bus.h"
-#include "log.h"
-#include "macro.h"
-#include "util.h"
-#include "special.h"
-#include "utmp-wtmp.h"
-#include "bus-util.h"
+//#include "alloc-util.h"
#include "bus-error.h"
-#include "unit-name.h"
+//#include "bus-util.h"
+//#include "formats-util.h"
+//#include "log.h"
+//#include "macro.h"
+//#include "special.h"
+//#include "unit-name.h"
+//#include "util.h"
+#include "utmp-wtmp.h"
+/// Additional includes needed by elogind
+#include "string-util.h"
+#include "time-util.h"
+#include "update-utmp.h"
typedef struct Context {
sd_bus *bus;
#ifdef HAVE_AUDIT
@@ -47,8 +49,9 @@ typedef struct Context {
#endif
} Context;
+#if 0 /// UNNEEDED by elogind
static usec_t get_startup_time(Context *c) {
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
usec_t t = 0;
int r;
@@ -63,7 +66,7 @@ static usec_t get_startup_time(Context *c) {
&error,
't', &t);
if (r < 0) {
- log_error("Failed to get timestamp: %s", bus_error_message(&error, -r));
+ log_error_errno(r, "Failed to get timestamp: %s", bus_error_message(&error, r));
return 0;
}
@@ -85,7 +88,7 @@ static int get_current_runlevel(Context *c) {
{ '1', SPECIAL_RESCUE_TARGET },
};
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
unsigned i;
@@ -106,17 +109,16 @@ static int get_current_runlevel(Context *c) {
"ActiveState",
&error,
&state);
- if (r < 0) {
- log_warning("Failed to get state: %s", bus_error_message(&error, -r));
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "Failed to get state: %s", bus_error_message(&error, r));
- if (streq(state, "active") || streq(state, "reloading"))
+ if (STR_IN_SET(state, "active", "reloading"))
return table[i].runlevel;
}
return 0;
}
+#endif // 0
static int on_reboot(Context *c) {
int r = 0, q;
@@ -131,14 +133,17 @@ static int on_reboot(Context *c) {
if (c->audit_fd >= 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_errno(errno, "Failed to send audit message: %m");
- r = -errno;
+ r = log_error_errno(errno, "Failed to send audit message: %m");
}
#endif
+#if 0 /// systemd hasn't started the system, so elogind always uses NOW()
/* If this call fails it will return 0, which
* utmp_put_reboot() will then fix to the current time */
t = get_startup_time(c);
+#else
+ t = now(CLOCK_REALTIME);
+#endif // 0
q = utmp_put_reboot(t);
if (q < 0) {
@@ -161,8 +166,7 @@ static int on_shutdown(Context *c) {
if (c->audit_fd >= 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_errno(errno, "Failed to send audit message: %m");
- r = -errno;
+ r = log_error_errno(errno, "Failed to send audit message: %m");
}
#endif
@@ -175,6 +179,7 @@ static int on_shutdown(Context *c) {
return r;
}
+#if 0 /// UNNEEDED by elogind
static int on_runlevel(Context *c) {
int r = 0, q, previous, runlevel;
@@ -211,11 +216,8 @@ static int on_runlevel(Context *c) {
runlevel > 0 ? runlevel : 'N') < 0)
return log_oom();
- 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;
- }
+ if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM)
+ r = log_error_errno(errno, "Failed to send audit message: %m");
}
#endif
@@ -227,13 +229,19 @@ static int on_runlevel(Context *c) {
return r;
}
+#endif // 0
+#if 0 /// elogind needs this to be a callable function
int main(int argc, char *argv[]) {
+#else
+void update_utmp(int argc, char* argv[], sd_bus *bus) {
+#endif // 0
Context c = {
#ifdef HAVE_AUDIT
.audit_fd = -1
#endif
};
+#if 0 /// UNNEEDED by elogind
int r;
if (getppid() != 1) {
@@ -251,6 +259,11 @@ int main(int argc, char *argv[]) {
log_open();
umask(0022);
+#else
+ assert(2 == argc);
+ assert(argv[1]);
+ assert(bus);
+#endif // 0
#ifdef HAVE_AUDIT
/* If the kernel lacks netlink or audit support,
@@ -259,7 +272,8 @@ int main(int argc, char *argv[]) {
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 0 /// UNNEEDED by elogind
+ r = bus_connect_system_systemd(&c.bus);
if (r < 0) {
log_error_errno(r, "Failed to get D-Bus connection: %m");
r = -EIO;
@@ -282,13 +296,20 @@ int main(int argc, char *argv[]) {
log_debug("systemd-update-utmp stopped as pid "PID_FMT, getpid());
finish:
+#else
+ c.bus = bus;
+ if (streq(argv[1], "reboot"))
+ (void)on_reboot(&c);
+ else if (streq(argv[1], "shutdown"))
+ (void)on_shutdown(&c);
+#endif // 0
#ifdef HAVE_AUDIT
if (c.audit_fd >= 0)
audit_close(c.audit_fd);
#endif
- if (c.bus)
- sd_bus_unref(c.bus);
-
+ sd_bus_flush_close_unref(c.bus);
+#if 0 /// UNNEEDED by elogind
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+#endif // 0
}