From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 1 Sep 2011 19:15:00 +0000 (+0200)
Subject: stdout-bridge: set facility of messages with no facility to configured facility inste... 
X-Git-Tag: v36~62
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=43de46ab92e3b343c2e35b42cf0728a9adf48f1c;ds=sidebyside

stdout-bridge: set facility of messages with no facility to configured facility instead of LOG_USER
---

diff --git a/src/stdout-syslog-bridge.c b/src/stdout-syslog-bridge.c
index 48a301f6a..7358a42f7 100644
--- a/src/stdout-syslog-bridge.c
+++ b/src/stdout-syslog-bridge.c
@@ -111,9 +111,9 @@ static int stream_log(Stream *s, char *p, usec_t ts) {
         if (*p == 0)
                 return 0;
 
-        /* Patch in LOG_USER facility if necessary */
+        /* Patch in configured facility if necessary */
         if ((priority & LOG_FACMASK) == 0)
-                priority = LOG_USER | LOG_PRI(priority);
+                priority = (s->priority & LOG_FACMASK) | priority;
 
         /*
          * The format glibc uses to talk to the syslog daemon is: