diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-02 08:40:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-02 08:40:04 +0200 |
| commit | 37a018c3ce7eded66fdc478ad6bc074d70410baf (patch) | |
| tree | 1573c0bbf9cc86593ed5e778af8b6d0af481b316 | |
| parent | a607651cde36e35fa8c398d907b073e64176ff4e (diff) | |
| parent | c94cea05ad88f92bed8a2d5004718a9eb4de01b6 (diff) | |
| download | rsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.tar.gz rsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.tar.bz2 rsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.zip | |
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -23,6 +23,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 b4289345..061cd736 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; |