diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
| commit | 1414dacae03c90c1ab83c04227474ecac7d40c76 (patch) | |
| tree | 287761f728e2e84aaec118e7664495dd5d196b04 /plugins/imuxsock/imuxsock.c | |
| parent | 5c0cff0e5a3a1a00b6176af7e4fefbdc5af8f9a3 (diff) | |
| parent | 791b16ce06d75944e338a6e5fa14c0394bde6f1d (diff) | |
| download | rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.gz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.xz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index b3007d19..3df52d75 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -565,8 +565,11 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred) parse++; lenMsg--; /* '>' */ if((pLstn->flags & IGNDATE)) { - parse += 16; /* just skip timestamp */ - lenMsg -= 16; + /* in this case, we still need to find out if we have a valid + * datestamp or not .. and advance the parse pointer accordingly. + */ + struct syslogTime dummy; + datetime.ParseTIMESTAMP3164(&dummy, &parse, &lenMsg); } else { if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &parse, &lenMsg) != RS_RET_OK) { DBGPRINTF("we have a problem, invalid timestamp in msg!\n"); |