X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fkmsg-syslogd.c;h=7fd69f858428f79380f047aa448d5bfb463b3014;hb=2096e009a790073a934f5cd07d17024d3b199d0b;hp=60d3244b3bd126ebc98bec1da79cfd780734d5b3;hpb=7c3b203c5c69fc37c8d143851cd395cbf8920786;p=elogind.git diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c index 60d3244b3..7fd69f858 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; @@ -379,7 +376,7 @@ static int process_event(Server *s, struct epoll_event *ev) { return -errno; } - log_debug("Received SIG%s", strna(signal_to_string(sfsi.ssi_signo))); + log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo)); return 0; } else { @@ -455,6 +452,8 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); + umask(0022); + if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); return EXIT_FAILURE;