From 49a5c0c3b9dbb91e3cdd97b2975a3e12c53fe73e Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 17 Oct 2012 11:29:45 +0200 Subject: imklog: skip leading spaces in kernel timestamp --- plugins/imklog/bsd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c index eaf8e5ca..428d3cc2 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -92,7 +92,9 @@ submitSyslog(int pri, uchar *buf) /* we now try to parse the timestamp. iff it parses, we assume * it is a timestamp. Otherwise we know for sure it is no ts ;) */ - i = 4; /* first digit after '[' */ + i = 4; /* space or first digit after '[' */ + while(buf[i] && isspace(buf[i])) + ++i; /* skip space */ secs = 0; while(buf[i] && isdigit(buf[i])) { secs = secs * 10 + buf[i] - '0'; -- cgit v1.2.3 From 51754401f72376ea5f1c5b74b9c1772ab6f7ae4f Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 17 Oct 2012 11:55:34 +0200 Subject: imklog: use memmove to remove kernel timestamp --- plugins/imklog/bsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c index 428d3cc2..bb45c97a 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -120,7 +120,7 @@ submitSyslog(int pri, uchar *buf) /* we have a timestamp */ DBGPRINTF("kernel timestamp is %ld %ld\n", secs, nsecs); bufsize= strlen((char*)buf); - memcpy(buf+3, buf+i, bufsize - i + 1); + memmove(buf+3, buf+i, bufsize - i + 1); clock_gettime(CLOCK_MONOTONIC, &monotonic); clock_gettime(CLOCK_REALTIME, &realtime); -- cgit v1.2.3 From d4f9c384c2ca643971bbe1557dddf0b6d10a33da Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 17 Oct 2012 14:44:04 +0200 Subject: imklog: use memmove instead of memcpy (solaris) --- plugins/imklog/solaris_cddl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/imklog/solaris_cddl.c b/plugins/imklog/solaris_cddl.c index 7e86c68c..cf5467fc 100644 --- a/plugins/imklog/solaris_cddl.c +++ b/plugins/imklog/solaris_cddl.c @@ -216,7 +216,7 @@ sun_getkmsg() */ remlen = buflen - len; - (void) memcpy(buf, &buf[len], remlen); + (void) memmove(buf, &buf[len], remlen); dat.maxlen = MAXLINE - remlen; dat.buf = &buf[remlen]; } else { -- cgit v1.2.3 From 1e4ca690525ec4a547ad0fe3efbcd6d059dda15d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Oct 2012 16:48:50 +0200 Subject: preparing for 5.10.1 --- ChangeLog | 4 ++-- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1edcb71f..18bb76ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ --------------------------------------------------------------------------- -Version 5.10.1 [V5-STABLE], 2012-0?-?? -- bugfix: imuxsock truncated head of received message +Version 5.10.1 [V5-STABLE], 2012-10-17 +- bugfix: imuxsock and imklog truncated head of received message This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. diff --git a/configure.ac b/configure.ac index 1069db7c..eabd2272 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[5.10.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.10.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index 4250e2f0..83b06697 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 5.10.0 (stable branch) of rsyslog. +

This documentation is for version 5.10.1 (stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3