From 46b131574fdd7d77c15a0919ca9010cad7aa6ac7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 11 Jul 2014 13:30:16 +0200 Subject: journald: turn ForwardToSyslog= off by default After all, rsyslog and friends nowadays read their data directly from the journal, hence the forwarding is unnecessary in most cases. --- src/journal/journald-syslog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/journal/journald-syslog.c') diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index b826e23c01..afeb8bd129 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -37,14 +37,14 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, struct ucred *ucred, struct timeval *tv) { - union sockaddr_union sa = { + static const union sockaddr_union sa = { .un.sun_family = AF_UNIX, .un.sun_path = "/run/systemd/journal/syslog", }; struct msghdr msghdr = { .msg_iov = (struct iovec *) iovec, .msg_iovlen = n_iovec, - .msg_name = &sa, + .msg_name = (struct sockaddr*) &sa.sa, .msg_namelen = offsetof(union sockaddr_union, un.sun_path) + strlen("/run/systemd/journal/syslog"), }; @@ -426,7 +426,7 @@ int server_open_syslog_socket(Server *s) { assert(s); if (s->syslog_fd < 0) { - union sockaddr_union sa = { + static const union sockaddr_union sa = { .un.sun_family = AF_UNIX, .un.sun_path = "/run/systemd/journal/dev-log", }; -- cgit v1.2.3-54-g00ecf