journald: set SO_PASSEC only if selinux is enabled
This commit is contained in:
parent
4367379907
commit
67aa455172
|
@ -2308,10 +2308,12 @@ static int open_syslog_socket(Server *s) {
|
||||||
return -errno;
|
return -errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_SE
|
||||||
one = 1;
|
one = 1;
|
||||||
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
|
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
log_warning("SO_PASSSEC failed: %m");
|
log_warning("SO_PASSSEC failed: %m");
|
||||||
|
#endif
|
||||||
|
|
||||||
one = 1;
|
one = 1;
|
||||||
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
|
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
|
||||||
|
@ -2369,10 +2371,12 @@ static int open_native_socket(Server*s) {
|
||||||
return -errno;
|
return -errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_SELINUX
|
||||||
one = 1;
|
one = 1;
|
||||||
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
|
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
log_warning("SO_PASSSEC failed: %m");
|
log_warning("SO_PASSSEC failed: %m");
|
||||||
|
#endif
|
||||||
|
|
||||||
one = 1;
|
one = 1;
|
||||||
r = setsockopt(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
|
r = setsockopt(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
|
||||||
|
|
Loading…
Reference in a new issue