summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-02 08:40:04 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-02 08:40:04 +0200
commit37a018c3ce7eded66fdc478ad6bc074d70410baf (patch)
tree1573c0bbf9cc86593ed5e778af8b6d0af481b316 /plugins
parenta607651cde36e35fa8c398d907b073e64176ff4e (diff)
parentc94cea05ad88f92bed8a2d5004718a9eb4de01b6 (diff)
downloadrsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.tar.gz
rsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.tar.xz
rsyslog-37a018c3ce7eded66fdc478ad6bc074d70410baf.zip
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
Diffstat (limited to 'plugins')
-rw-r--r--plugins/imuxsock/imuxsock.c6
1 files changed, 5 insertions, 1 deletions
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;