summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Smith <corsmith@gmail.com>2011-03-24 17:16:59 +0100
committerroot <root@localhost.localdomain>2011-03-24 17:16:59 +0100
commitd4539663f685910db1e8d7816508298b940c8590 (patch)
tree7d2db48cfad544db2b0b9f0f2dc4f8d6d41011ca
parentdec726ed46a75750b30117ba772fc82e8660db1d (diff)
downloadrsyslog-d4539663f685910db1e8d7816508298b940c8590.tar.gz
rsyslog-d4539663f685910db1e8d7816508298b940c8590.tar.xz
rsyslog-d4539663f685910db1e8d7816508298b940c8590.zip
bugfix: PRI was invalid on Solaris for message from local log socket
Signed-off-by: root <root@localhost.localdomain>
-rw-r--r--ChangeLog1
-rw-r--r--runtime/parser.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index caa53b8c..0fb8334d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 4.7.4 [v4-???] (rgerhards), 2010-11-??
+- bugfix: PRI was invalid on Solaris for message from local log socket
- added $LocalHostName config directive
- bugfix: local hostname was pulled too-early, so that some config
directives (namely FQDN settings) did not have any effect
diff --git a/runtime/parser.c b/runtime/parser.c
index fdda9546..be9304d7 100644
--- a/runtime/parser.c
+++ b/runtime/parser.c
@@ -303,10 +303,10 @@ rsRetVal parseMsg(msg_t *pMsg)
if(pri & ~(LOG_FACMASK|LOG_PRIMASK))
pri = DEFUPRI;
}
+ pMsg->iFacility = LOG_FAC(pri);
+ pMsg->iSeverity = LOG_PRI(pri);
+ MsgSetAfterPRIOffs(pMsg, msg - pMsg->pszRawMsg);
}
- pMsg->iFacility = LOG_FAC(pri);
- pMsg->iSeverity = LOG_PRI(pri);
- MsgSetAfterPRIOffs(pMsg, msg - pMsg->pszRawMsg);
/* rger 2005-11-24 (happy thanksgiving!): we now need to check if we have
* a traditional syslog message or one formatted according to syslog-protocol.