diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-10-18 19:48:18 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-18 19:50:29 +0200 |
commit | 2ff48e981e6cd1ccbfae49943274d9c8319a5e5d (patch) | |
tree | 10ec8200518d5d95476033dbb44df30ad7e34bf6 /src/journal/journald-native.c | |
parent | 0fef9583615435d41a7724b0c49f530433b4c572 (diff) | |
download | systemd-2ff48e981e6cd1ccbfae49943274d9c8319a5e5d.tar.gz |
tree-wide: introduce setsockopt_int() helper and make use of it everywhere
As suggested by @heftig:
https://github.com/systemd/systemd/commit/6d5e65f6454212cd400d0ebda34978a9f20cc26a#commitcomment-30938667
Diffstat (limited to 'src/journal/journald-native.c')
-rw-r--r-- | src/journal/journald-native.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 208758785d..7dd9ca62d5 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -462,21 +462,21 @@ int server_open_native_socket(Server*s) { } else (void) fd_nonblock(s->native_fd, true); - r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSCRED, &const_int_one, sizeof(const_int_one)); + r = setsockopt_int(s->native_fd, SOL_SOCKET, SO_PASSCRED, true); if (r < 0) - return log_error_errno(errno, "SO_PASSCRED failed: %m"); + return log_error_errno(r, "SO_PASSCRED failed: %m"); #if HAVE_SELINUX if (mac_selinux_use()) { - r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &const_int_one, sizeof(const_int_one)); + r = setsockopt_int(s->native_fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) - log_warning_errno(errno, "SO_PASSSEC failed: %m"); + log_warning_errno(r, "SO_PASSSEC failed: %m"); } #endif - r = setsockopt(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, &const_int_one, sizeof(const_int_one)); + r = setsockopt_int(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, true); if (r < 0) - return log_error_errno(errno, "SO_TIMESTAMP failed: %m"); + return log_error_errno(r, "SO_TIMESTAMP failed: %m"); r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, server_process_datagram, s); if (r < 0) |