summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-18 11:10:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-18 11:10:07 +0200
commit2879b72bdca5ec0bc5d26405662305d1a562a382 (patch)
tree842a21b1f6141a63599c200d86640990696ab386
parent88e9b2d0f30a5c5fc3ce4c25f10f8947f93b6f7b (diff)
downloadrsyslog-2879b72bdca5ec0bc5d26405662305d1a562a382.tar.gz
rsyslog-2879b72bdca5ec0bc5d26405662305d1a562a382.tar.xz
rsyslog-2879b72bdca5ec0bc5d26405662305d1a562a382.zip
bugfix: remove PRI part from kernel message if it is present
-rw-r--r--ChangeLog2
-rw-r--r--plugins/imklog/imklog.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cb9bc9f..438f79b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ Version 3.18.1 (rgerhards), 2008-07-??
is just a simple addition of faciltity and severity). I have changed
this to use own, consistent, code for PRI calculation. [Backport from
3.19.10]
+- bugfix: remove PRI part from kernel message if it is present
+ Thanks to Michael Biebl for reporting this bug
- bugfix: mark messages were not correctly written to text log files
the markmessageinterval was not correctly propagated to all places
where it was needed. This resulted in rsyslog using the default
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 38f2a23c..f7aee5b1 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -140,6 +140,7 @@ parsePRI(uchar **ppSz, int *piPri)
/* OK, we have a valid PRI */
*piPri = i;
+ *ppSz = pSz + 1; /* update msg ptr to position after PRI */
finalize_it:
RETiRet;