From 6e866b331d7cd4a5e0759dd160dea6edabd3678e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 21 Dec 2018 22:06:22 +0100 Subject: New upstream version 240 --- src/update-utmp/update-utmp.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src/update-utmp/update-utmp.c') diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 70ed723a8e..7d66ed3357 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -30,6 +30,17 @@ typedef struct Context { #endif } Context; +static void context_clear(Context *c) { + assert(c); + + c->bus = sd_bus_flush_close_unref(c->bus); +#if HAVE_AUDIT + if (c->audit_fd >= 0) + audit_close(c->audit_fd); + c->audit_fd = -1; +#endif +} + static usec_t get_startup_time(Context *c) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; usec_t t = 0; @@ -205,7 +216,7 @@ static int on_runlevel(Context *c) { } int main(int argc, char *argv[]) { - Context c = { + _cleanup_(context_clear) Context c = { #if HAVE_AUDIT .audit_fd = -1 #endif @@ -222,9 +233,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); + log_setup_service(); umask(0022); @@ -238,8 +247,7 @@ int main(int argc, char *argv[]) { r = bus_connect_system_systemd(&c.bus); if (r < 0) { log_error_errno(r, "Failed to get D-Bus connection: %m"); - r = -EIO; - goto finish; + return EXIT_FAILURE; } log_debug("systemd-update-utmp running as pid "PID_FMT, getpid_cached()); @@ -252,17 +260,10 @@ int main(int argc, char *argv[]) { r = on_runlevel(&c); else { log_error("Unknown command %s", argv[1]); - r = -EINVAL; + return EXIT_FAILURE; } log_debug("systemd-update-utmp stopped as pid "PID_FMT, getpid_cached()); -finish: -#if HAVE_AUDIT - if (c.audit_fd >= 0) - audit_close(c.audit_fd); -#endif - - sd_bus_flush_close_unref(c.bus); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- cgit v1.2.1