diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-07-26 12:57:33 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-08-19 11:14:14 -0400 |
| commit | ac50788b0f5aeee09e7d45db28ae8ab7f39cd52e (patch) | |
| tree | d215e1df7bf20f2e44c04256d1f44248d9885e20 /src/journal/journald-stream.c | |
| parent | 763a24a3b62f0eaac43fb58202ad3594f1af09ac (diff) | |
journal: fix parsing of facility in syslog messages
In 49998b383 (journald: do not overwrite syslog facility when
parsing priority) journald started ignoring facility part when
reading service stderr to convert to syslog messages. In this
case it is fine, because only the priority is allowed.
But the same codepath is used for syslog messages, where the
facility should be used. Split the two codepaths by explicitly
specyfing whether the facility should be ignored or not.
https://bugzilla.redhat.com/show_bug.cgi?id=988814
Diffstat (limited to 'src/journal/journald-stream.c')
| -rw-r--r-- | src/journal/journald-stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index e98fe94b46..9c4efec9bc 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -90,7 +90,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { priority = s->priority; if (s->level_prefix) - syslog_parse_priority((char**) &p, &priority); + syslog_parse_priority((char**) &p, &priority, false); if (s->forward_to_syslog || s->server->forward_to_syslog) server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL); |