diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index f2b867da3d..fed81161e0 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -483,13 +483,11 @@ int server_open_native_socket(Server *s, const char *native_socket) { if (r < 0) return log_error_errno(r, "SO_PASSCRED failed: %m"); -#if HAVE_SELINUX if (mac_selinux_use()) { r = setsockopt_int(s->native_fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) log_warning_errno(r, "SO_PASSSEC failed: %m"); } -#endif r = setsockopt_int(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, true); if (r < 0) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 0da7dcfcf5..91ea41fa78 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -70,9 +70,8 @@ static void forward_syslog_iovec( msghdr.msg_controllen = cmsg->cmsg_len; } - /* Forward the syslog message we received via /dev/log to - * /run/systemd/syslog. Unfortunately we currently can't set - * the SO_TIMESTAMP auxiliary data, and hence we don't. */ + /* Forward the syslog message we received via /dev/log to /run/systemd/syslog. Unfortunately we + * currently can't set the SO_TIMESTAMP auxiliary data, and hence we don't. */ if (sendmsg(s->syslog_fd, &msghdr, MSG_NOSIGNAL) >= 0) return; @@ -484,13 +483,11 @@ int server_open_syslog_socket(Server *s, const char *syslog_socket) { if (r < 0) return log_error_errno(r, "SO_PASSCRED failed: %m"); -#if HAVE_SELINUX if (mac_selinux_use()) { r = setsockopt_int(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) log_warning_errno(r, "SO_PASSSEC failed: %m"); } -#endif r = setsockopt_int(s->syslog_fd, SOL_SOCKET, SO_TIMESTAMP, true); if (r < 0)