diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-11-30 09:37:13 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2011-11-30 11:00:28 +0100 |
| commit | 1a2801529e916ec31d2a8cc66cd5c3b8d9ad9caa (patch) | |
| tree | b2acaee28cce29142c929a5b4aa67f3d476f62a3 | |
| parent | 75d3fc60f88e08bf953063819a8a04b881d6db23 (diff) | |
syslog: use PassCred=yes for the /dev/log socket
Both kmsg-syslogd and the real syslog service want to receive
SCM_CREDENTIALS. With socket activation it is too late to set
SO_PASSCRED in the services.
| -rw-r--r-- | src/kmsg-syslogd.c | 5 | ||||
| -rw-r--r-- | units/syslog.socket | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c index 0901a0e49b..7fd69f8584 100644 --- a/src/kmsg-syslogd.c +++ b/src/kmsg-syslogd.c @@ -91,7 +91,7 @@ static int server_init(Server *s, unsigned n_sockets) { } for (i = 0; i < n_sockets; i++) { - int fd, one = 1; + int fd; fd = SD_LISTEN_FDS_START+i; @@ -106,9 +106,6 @@ static int server_init(Server *s, unsigned n_sockets) { goto fail; } - if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) - log_error("SO_PASSCRED failed: %m"); - zero(ev); ev.events = EPOLLIN; ev.data.fd = fd; diff --git a/units/syslog.socket b/units/syslog.socket index 500bb7c314..e74b55948e 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -18,6 +18,7 @@ Wants=syslog.target [Socket] ListenDatagram=/dev/log SocketMode=0666 +PassCred=yes # The service we activate on incoming traffic is # systemd-kmsg-syslogd.service. That doesn't mean however, that this |