X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-syslog.c;h=afeb8bd129ad0532e582b28fd08ef2b27b959f19;hb=1651e2c61e544de9ca947c8b3202552b1272ef57;hp=434eac428f012800867fd4048eb79ff4a8deaab5;hpb=de0671ee7fe465e108f62dcbbbe9366f81dd9e9a;p=elogind.git diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 434eac428..afeb8bd12 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,9 +426,9 @@ 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 = "/dev/log", + .un.sun_path = "/run/systemd/journal/dev-log", }; s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);