chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
journald: do not overwrite syslog facility when parsing priority
[elogind.git]
/
src
/
journal
/
journald-syslog.c
diff --git
a/src/journal/journald-syslog.c
b/src/journal/journald-syslog.c
index 000f5acc100b8637c6d74de0578462ad65abebf5..4aeb9a35f08da1534aadefe90126c975919e6d02 100644
(file)
--- 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;
}