diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:24:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:24:02 +0100 |
| commit | af720e9f9dffa205cf4b323c2a420c1cca6ddc17 (patch) | |
| tree | 122929be8beb91c36005d9e722d0c2b4c114d9be | |
| parent | 832d6e1e2c88455be6bb0929591715499602ad56 (diff) | |
| parent | 74722b23317d556e86ad7fb77913c4c864c239c4 (diff) | |
| download | rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.tar.gz rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.tar.bz2 rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 7 |
2 files changed, 10 insertions, 3 deletions
@@ -1,9 +1,13 @@ --------------------------------------------------------------------------- Version 5.8.7 [V5-stable] 2011-??-?? -- bugfix: stats counter were not properly initialized on creation +- bugfix: imuxsock did truncate part of received message if it did not + contain a proper date. The truncation occured because we removed that + part of the messages that was expected to be the date. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 - bugfix: potential abort after reading invalid X.509 certificate closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Thanks to Tomas Heinrich for the patch +- bugfix: stats counter were not properly initialized on creation --------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-10-21 - bugfix: missing whitespace after property-based filter was not detected diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 2697c48a..feddb20c 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"); |