summaryrefslogtreecommitdiff
path: root/src/journal/journald-syslog.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-08-10 11:07:54 +0900
committerEvgeny Vereshchagin <evvers@ya.ru>2018-08-10 10:31:29 +0300
commit8595102d3ddde6d25c282f965573a6de34ab4421 (patch)
treefdfee788ad6dd8d50aaa9d4cc6740473919399ef /src/journal/journald-syslog.c
parenta95696e33d750b4a6d3213c23ac4c7899131bb37 (diff)
downloadsystemd-8595102d3ddde6d25c282f965573a6de34ab4421.tar.gz
journal: do not remove multiple spaces after identifier in syslog message
Single space is used as separator. C.f. discussions in #156. Fixes #9839 introduced by a6aadf4ae0bae185dc4c414d492a4a781c80ffe5.
Diffstat (limited to 'src/journal/journald-syslog.c')
-rw-r--r--src/journal/journald-syslog.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 031c7adee5..6dc6b0741a 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -218,7 +218,9 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
if (t)
*identifier = t;
- e += strspn(p + e, WHITESPACE);
+ /* Single space is used as separator */
+ if (p[e] != '\0' && strchr(WHITESPACE, p[e]))
+ e++;
*buf = p + e;
return e;