diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 15:21:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 15:21:08 +0200 |
| commit | 3946d0f8dfaa629665b20c1f99ad16d5d254f266 (patch) | |
| tree | e0bba518fb8980eedd72a6587509eaab296ccf39 /plugins/imuxsock | |
| parent | a0c9fcfc77fb6b6bfa51a60760fd56a500f0083e (diff) | |
| parent | 6ed28016ca1a98f183f72d1d381a5027949ca965 (diff) | |
| download | rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.tar.gz rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.tar.xz rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'plugins/imuxsock')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 38934e3a..c2dbdba2 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -811,7 +811,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim CHKiRet(msgConstructWithTime(&pMsg, &st, tt)); MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv); parser.SanitizeMsg(pMsg); - lenMsg = pMsg->iLenRawMsg - offs; + lenMsg = pMsg->iLenRawMsg - offs; /* SanitizeMsg() may have changed the size */ MsgSetInputName(pMsg, pInputName); MsgSetFlowControlType(pMsg, pLstn->flowCtl); @@ -841,7 +841,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim parse[15] = ' '; /* re-write \0 from fromatTimestamp3164 by SP */ /* update "counters" to reflect processed timestamp */ parse += 16; - lenMsg -= 16; } } @@ -856,12 +855,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim if(pLstn->bWritePid) fixPID(bufParseTAG, &i, cred); MsgSetTAG(pMsg, bufParseTAG, i); - - if (pLstn->bAnnotate) { - MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg - 16); - } else { - MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg); - } + MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg); if(pLstn->bParseHost) { pMsg->msgFlags = pLstn->flags | PARSE_HOSTNAME; |