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-syslog.h | |
| 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-syslog.h')
| -rw-r--r-- | src/journal/journald-syslog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h index 324b70eef0..8ccdb77a09 100644 --- a/src/journal/journald-syslog.h +++ b/src/journal/journald-syslog.h @@ -25,7 +25,7 @@ int syslog_fixup_facility(int priority) _const_; -void syslog_parse_priority(char **p, int *priority); +void syslog_parse_priority(char **p, int *priority, bool with_facility); size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid); void server_forward_syslog(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred, struct timeval *tv); |