diff options
Diffstat (limited to 'src/update-utmp/update-utmp.c')
| -rw-r--r-- | src/update-utmp/update-utmp.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index ea9b0c9c84..b2998dce43 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -130,8 +130,8 @@ 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 @@ -160,8 +160,8 @@ 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 @@ -210,11 +210,9 @@ 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 @@ -286,8 +284,6 @@ finish: audit_close(c.audit_fd); #endif - if (c.bus) - sd_bus_unref(c.bus); - + sd_bus_unref(c.bus); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } |