summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/journald.conf.xml10
-rw-r--r--src/journal/journald-server.c1
-rw-r--r--src/journal/journald-syslog.c6
-rw-r--r--src/journal/journald.conf2
4 files changed, 9 insertions, 10 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 046609e401..5538b968e7 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -395,8 +395,8 @@
forwarding to syslog is enabled but no
syslog daemon is running, the
respective option has no effect. By
- default, only forwarding to syslog and
- wall is enabled. These settings may be
+ default, only forwarding wall is
+ enabled. These settings may be
overridden at boot time with the
kernel command line options
<literal>systemd.journald.forward_to_syslog=</literal>,
@@ -405,9 +405,9 @@
and
<literal>systemd.journald.forward_to_wall=</literal>.
When forwarding to the console, the
- TTY to log to can be changed
- with <varname>TTYPath=</varname>,
- described below.</para></listitem>
+ TTY to log to can be changed with
+ <varname>TTYPath=</varname>, described
+ below.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 58410a2465..f8da4daa41 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1473,7 +1473,6 @@ int server_init(Server *s) {
s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
- s->forward_to_syslog = true;
s->forward_to_wall = true;
s->max_file_usec = DEFAULT_MAX_FILE_USEC;
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",
};
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index cded4a9d47..2073f1bf21 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -23,7 +23,7 @@
#RuntimeMaxFileSize=
#MaxRetentionSec=
#MaxFileSec=1month
-#ForwardToSyslog=yes
+#ForwardToSyslog=no
#ForwardToKMsg=no
#ForwardToConsole=no
#ForwardToWall=yes