summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-10 18:10:12 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-10 18:10:12 -0400
commit49998b38321fca8f431258019e16a9824c643c09 (patch)
tree119e6e749911548e2b85042ca9a91929a14d6f5c
parentd783cd0423459ff703122f523b86c9d094be2851 (diff)
journald: do not overwrite syslog facility when parsing priority
https://bugs.freedesktop.org/show_bug.cgi?id=65610
-rw-r--r--src/journal/journald-syslog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 000f5acc10..4aeb9a35f0 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -268,7 +268,7 @@ void syslog_parse_priority(char **p, int *priority) {
if (a < 0 || b < 0 || c < 0)
return;
- *priority = a*100+b*10+c;
+ *priority = (*priority & LOG_FACMASK) | (a*100 + b*10 + c);
*p += k;
}