diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:29:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:29:19 +0100 |
| commit | 16811e2f38133c47a870382b878fc9099dbb2859 (patch) | |
| tree | b2ecbffaf7d44ad452175396226fef0c0c21093b | |
| parent | 8cc6eda2c00e4efd63de0b4f69d9d66b73e3c706 (diff) | |
| parent | 5a7d961304df67207489d7246a465115907dd9d8 (diff) | |
| download | rsyslog-16811e2f38133c47a870382b878fc9099dbb2859.tar.gz rsyslog-16811e2f38133c47a870382b878fc9099dbb2859.tar.bz2 rsyslog-16811e2f38133c47a870382b878fc9099dbb2859.zip | |
Merge branch 'v6-stable'
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imklog/imklog.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -111,6 +111,8 @@ Version 6.2.1 [v6-stable], 2012-01-?? - re-licensed larger parts of the codebase under the Apache license 2.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 6.2.0 [v6-stable], 2012-01-09 - bugfix (kind of): removed numerical part from pri-text @@ -472,6 +474,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 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 04902dec..71cb9ac6 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -135,8 +135,8 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity, struct timeval * 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: |