summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-16 17:35:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-16 17:35:45 +0200
commitda52cbae520e747568162ad558bf01d40658c745 (patch)
treea96d3358e2e58d1923d21a6db70c0e9ff7f9dc60
parentec6230cffe6e06957113d53272d00dc859a3e617 (diff)
downloadrsyslog-da52cbae520e747568162ad558bf01d40658c745.tar.gz
rsyslog-da52cbae520e747568162ad558bf01d40658c745.tar.xz
rsyslog-da52cbae520e747568162ad558bf01d40658c745.zip
bugfix: timestamp was incorrectly calculated for timezones with minute offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
-rw-r--r--ChangeLog3
-rw-r--r--runtime/datetime.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a50c4ee0..b547f0ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- bugfix: timestamp was incorrectly calculated for timezones with minute
+ offset
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- improved some code based on clang static analyzer results
---------------------------------------------------------------------------
Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
diff --git a/runtime/datetime.c b/runtime/datetime.c
index 20ca6191..bed33127 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -112,7 +112,7 @@ static void getCurrTime(struct syslogTime *t)
else
t->OffsetMode = '+';
t->OffsetHour = lBias / 3600;
- t->OffsetMinute = lBias % 3600;
+ t->OffsetMinute = (lBias % 3600) / 60;
}