[systemd-commits] src/journal

[Zbigniew Jędrzejewski-Szmek]

 src/journal/journald-syslog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49998b38321fca8f431258019e16a9824c643c09
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jun 10 18:10:12 2013 -0400

    journald: do not overwrite syslog facility when parsing priority
    
    https://bugs.freedesktop.org/show_bug.cgi?id=65610

diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 000f5ac..4aeb9a3 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;
 }