diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-01 14:43:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-01 14:43:53 +0200 |
| commit | c94cea05ad88f92bed8a2d5004718a9eb4de01b6 (patch) | |
| tree | 8c6651f8ef1f2dee73c3ef173cb89166415a744b | |
| parent | 6e1774a3515893038914ab91eb2024dbb1ad3112 (diff) | |
| parent | dababe8645af32f2fdbd386d04f0b5a7bc9d1743 (diff) | |
| download | rsyslog-c94cea05ad88f92bed8a2d5004718a9eb4de01b6.tar.gz rsyslog-c94cea05ad88f92bed8a2d5004718a9eb4de01b6.tar.xz rsyslog-c94cea05ad88f92bed8a2d5004718a9eb4de01b6.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -21,6 +21,9 @@ Version 6.3.13 [BETA] 2012-07-?? Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342 - bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used +- bugfix: problem with cutting first 16 characters from message with + bAnnotate + Thanks to Milan Bartos for the patch. --------------------------------------------------------------------------- Version 6.3.12 [BETA] 2012-07-02 - support for elasticsearch via omelasticsearch added diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 389a465c..e8ce92d5 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -864,7 +864,11 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim fixPID(bufParseTAG, &i, cred); MsgSetTAG(pMsg, bufParseTAG, i); - MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg); + if (pLstn->bAnnotate) { + MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg - 16); + } else { + MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg); + } if(pLstn->bParseHost) { pMsg->msgFlags = pLstn->flags | PARSE_HOSTNAME; |