chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: add edit verb
[elogind.git]
/
src
/
update-utmp
/
update-utmp.c
diff --git
a/src/update-utmp/update-utmp.c
b/src/update-utmp/update-utmp.c
index 31cae709509daf42edda515966654e034ee9db95..15da83193b1643605afa5aeb94c2056bc2eedb61 100644
(file)
--- a/
src/update-utmp/update-utmp.c
+++ b/
src/update-utmp/update-utmp.c
@@
-131,9
+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 &&
+ if (audit_log_user_
comm_message(c->audit_fd, AUDIT_SYSTEM_BOOT, "", "systemd-update-utmp
", NULL, NULL, NULL, 1) < 0 &&
errno != EPERM) {
errno != EPERM) {
- log_error
(
"Failed to send audit message: %m");
+ log_error
_errno(errno,
"Failed to send audit message: %m");
r = -errno;
}
#endif
r = -errno;
}
#endif
@@
-144,7
+144,7
@@
static int on_reboot(Context *c) {
q = utmp_put_reboot(t);
if (q < 0) {
q = utmp_put_reboot(t);
if (q < 0) {
- log_error
("Failed to write utmp record: %s", strerror(-q)
);
+ log_error
_errno(q, "Failed to write utmp record: %m"
);
r = q;
}
r = q;
}
@@
-161,16
+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 &&
+ if (audit_log_user_
comm_message(c->audit_fd, AUDIT_SYSTEM_SHUTDOWN, "", "systemd-update-utmp
", NULL, NULL, NULL, 1) < 0 &&
errno != EPERM) {
errno != EPERM) {
- log_error
(
"Failed to send audit message: %m");
+ log_error
_errno(errno,
"Failed to send audit message: %m");
r = -errno;
}
#endif
q = utmp_put_shutdown();
if (q < 0) {
r = -errno;
}
#endif
q = utmp_put_shutdown();
if (q < 0) {
- log_error
("Failed to write utmp record: %s", strerror(-q)
);
+ log_error
_errno(q, "Failed to write utmp record: %m"
);
r = q;
}
r = q;
}
@@
-189,10
+189,8
@@
static int on_runlevel(Context *c) {
q = utmp_get_runlevel(&previous, NULL);
if (q < 0) {
q = utmp_get_runlevel(&previous, NULL);
if (q < 0) {
- if (q != -ESRCH && q != -ENOENT) {
- log_error("Failed to get current runlevel: %s", strerror(-q));
- return q;
- }
+ if (q != -ESRCH && q != -ENOENT)
+ return log_error_errno(q, "Failed to get current runlevel: %m");
previous = 0;
}
previous = 0;
}
@@
-215,9
+213,9
@@
static int on_runlevel(Context *c) {
runlevel > 0 ? runlevel : 'N') < 0)
return log_oom();
runlevel > 0 ? runlevel : 'N') < 0)
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) {
errno != EPERM) {
- log_error
(
"Failed to send audit message: %m");
+ log_error
_errno(errno,
"Failed to send audit message: %m");
r = -errno;
}
}
r = -errno;
}
}
@@
-225,7
+223,7
@@
static int on_runlevel(Context *c) {
q = utmp_put_runlevel(runlevel, previous);
if (q < 0 && q != -ESRCH && q != -ENOENT) {
q = utmp_put_runlevel(runlevel, previous);
if (q < 0 && q != -ESRCH && q != -ENOENT) {
- log_error
("Failed to write utmp record: %s", strerror(-q)
);
+ log_error
_errno(q, "Failed to write utmp record: %m"
);
r = q;
}
r = q;
}
@@
-261,11
+259,11
@@
int main(int argc, char *argv[]) {
* don't worry about it. */
c.audit_fd = audit_open();
if (c.audit_fd < 0 && errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
* don't worry about it. */
c.audit_fd = audit_open();
if (c.audit_fd < 0 && errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
- log_error
(
"Failed to connect to audit log: %m");
+ log_error
_errno(errno,
"Failed to connect to audit log: %m");
#endif
r = bus_open_system_systemd(&c.bus);
if (r < 0) {
#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;
}
r = -EIO;
goto finish;
}