diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:26:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:26:59 +0100 |
| commit | ce0fd65d288d15c0d5c260f14b0dd0909f76233e (patch) | |
| tree | 63f85fac417dd6c135827bfa23ba9c50460e9b8b | |
| parent | f93fb89aef962f1799bc9f9c344a57ed33fb4747 (diff) | |
| parent | c2970de8b0dd07c52f3a107e5ec3de55010c9999 (diff) | |
| download | rsyslog-ce0fd65d288d15c0d5c260f14b0dd0909f76233e.tar.gz rsyslog-ce0fd65d288d15c0d5c260f14b0dd0909f76233e.tar.xz rsyslog-ce0fd65d288d15c0d5c260f14b0dd0909f76233e.zip | |
Merge branch 'v5-stable' into v6-stable
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imklog/imklog.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -260,6 +260,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? Version 5.8.8 [V5-stable] 2012-0?-?? - bugfix: omprog made rsyslog abort on startup if not binary to execute was configured +- bugfix: imklog invalidly computed facility and severity + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 --------------------------------------------------------------------------- Version 5.8.7 [V5-stable] 2012-01-17 - bugfix: instabilities when using RFC5424 header fields diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 4112687a..16adbc21 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -109,8 +109,8 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity) MsgSetRcvFromIP(pMsg, pLocalHostIP); MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName())); MsgSetTAG(pMsg, pszTag, ustrlen(pszTag)); - pMsg->iFacility = LOG_FAC(iFacility); - pMsg->iSeverity = LOG_PRI(iSeverity); + pMsg->iFacility = iFacility; + pMsg->iSeverity = iSeverity; CHKiRet(submitMsg(pMsg)); finalize_it: |