summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-12 14:46:16 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-12 14:46:16 +0200
commit4bc99a5ead6892393033d22d6ce46052aca36155 (patch)
tree19bacc43fa117404f9852d8861a455035b430fdb
parent6f75d5460b12d6f57b3671d71d889747da0074cc (diff)
downloadrsyslog-4bc99a5ead6892393033d22d6ce46052aca36155.tar.gz
rsyslog-4bc99a5ead6892393033d22d6ce46052aca36155.tar.xz
rsyslog-4bc99a5ead6892393033d22d6ce46052aca36155.zip
bugfix: copy&paste error lead to dangling if
this caused a very minor issue with re-formatting a RFC3164 date when the message was invalidly formatted and had a colon immediately after the date. This was in the code for some years (even v1 had it) and I think it never had any effect at all in practice. Though, it should be fixed - but definitely nothing to worry about.
-rw-r--r--ChangeLog8
-rw-r--r--syslogd.c1
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1db933ff..730f65bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
---------------------------------------------------------------------------
+Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
+- bugfix: copy&paste error lead to dangling if - this caused a very minor
+ issue with re-formatting a RFC3164 date when the message was invalidly
+ formatted and had a colon immediately after the date. This was in the
+ code for some years (even v1 had it) and I think it never had any
+ effect at all in practice. Though, it should be fixed - but definitely
+ nothing to worry about.
+---------------------------------------------------------------------------
Version 2.0.6 V2-STABLE (rgerhards), 2008-08-07
- bugfix: IPv6 addresses could not be specified in forwarding actions
New syntax @[addr]:port introduced to enable that. Root problem was IPv6
diff --git a/syslogd.c b/syslogd.c
index a039eeed..afcc3b92 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1417,7 +1417,6 @@ static int srSLMGParseTIMESTAMP3164(struct syslogTime *pTime, char* pszTS)
pTime->second = srSLMGParseInt32(&pszTS);
if(pTime->second < 0 || pTime->second > 60)
return FALSE;
- if(*pszTS++ != ':')
/* OK, we actually have a 3164 timestamp, so let's indicate this
* and fill the rest of the properties. */