diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:57:32 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:57:32 +0100 |
commit | 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f (patch) | |
tree | c7a6228e7151aa74bc8e331694a1e795226550cd /src/journal/journald-audit.c | |
parent | treewide: use log_*_errno whenever %m is in the format string (diff) | |
download | systemd-4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f.tar.xz systemd-4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f.zip |
treewide: another round of simplifications
Using the same scripts as in f647962d64e "treewide: yet more log_*_errno
+ return simplifications".
Diffstat (limited to 'src/journal/journald-audit.c')
-rw-r--r-- | src/journal/journald-audit.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index ef4ad28833..69742fa59c 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -529,18 +529,14 @@ int server_open_audit(Server *s) { } r = bind(s->audit_fd, &sa.sa, sizeof(sa.nl)); - if (r < 0) { - log_error_errno(errno, "Failed to join audit multicast group: %m"); - return -errno; - } + if (r < 0) + return log_error_errno(errno, "Failed to join audit multicast group: %m"); } else fd_nonblock(s->audit_fd, 1); r = setsockopt(s->audit_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)); - if (r < 0) { - log_error_errno(errno, "Failed to set SO_PASSCRED on audit socket: %m"); - return -errno; - } + if (r < 0) + return log_error_errno(errno, "Failed to set SO_PASSCRED on audit socket: %m"); r = sd_event_add_io(s->event, &s->audit_event_source, s->audit_fd, EPOLLIN, process_datagram, s); if (r < 0) |