diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-12 04:08:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-12 04:08:22 +0100 |
| commit | 24bfc20f4c4f7ebb8774e68305e698a9ef7883b8 (patch) | |
| tree | 727f5dc4dc044d94c8c34b3b6e671e0804f387e8 | |
| parent | d4024e98d0a7cef5830c71992513bbef0e342874 (diff) | |
| parent | 6b72037d669d7aa6672cb23d5190606ed7c3dd8d (diff) | |
| download | rsyslog-24bfc20f4c4f7ebb8774e68305e698a9ef7883b8.tar.gz rsyslog-24bfc20f4c4f7ebb8774e68305e698a9ef7883b8.tar.xz rsyslog-24bfc20f4c4f7ebb8774e68305e698a9ef7883b8.zip | |
Merge branch 'v5-devel' into v5-devel-tmp
| -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. |