diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-12 04:05:34 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-12 04:05:34 +0100 |
| commit | 6b72037d669d7aa6672cb23d5190606ed7c3dd8d (patch) | |
| tree | b6bdf7086c11e98047fe4e8ec63deeba5af87187 /plugins | |
| parent | 9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (diff) | |
| download | rsyslog-6b72037d669d7aa6672cb23d5190606ed7c3dd8d.tar.gz rsyslog-6b72037d669d7aa6672cb23d5190606ed7c3dd8d.tar.xz rsyslog-6b72037d669d7aa6672cb23d5190606ed7c3dd8d.zip | |
regression fix: imuxsock-received messages were malformed
probably caused by a recent merge, was not present in 5.9.4
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 0fb3492d..14d8b594 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -713,7 +713,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim lenRcv = toffs + 1; } - /* we now create our own message object and submit it to the queue */ CHKiRet(msgConstructWithTime(&pMsg, &st, tt)); MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv); @@ -734,8 +733,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim * datestamp or not .. and advance the parse pointer accordingly. */ datetime.ParseTIMESTAMP3164(&dummyTS, &parse, &lenMsg); - parse += 16; /* just skip timestamp */ - lenMsg -= 16; } else { if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &parse, &lenMsg) != RS_RET_OK) { DBGPRINTF("we have a problem, invalid timestamp in msg!\n"); @@ -1018,7 +1015,6 @@ CODESTARTafterRun /* Clean-up files. */ for(i = startIndexUxLocalSockets; i < nfd; i++) if (listeners[i].sockName && listeners[i].fd != -1) { - /* If systemd passed us a socket it is systemd's job to clean it up. * Do not unlink it -- we will get same socket (node) from systemd * e.g. on restart again. |