summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--runtime/datetime.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 89238d1b..0bebf4f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -304,6 +304,8 @@ Version 6.6.1 [v6-stable] 2012-10-??
low-end case always happens in user space, without need for kernel
support as we can always directly aquire the lock - there is no
contention at all).
+- bugfix: invalid DST handling under Solaris
+ Thanks to Scott Severtson for the patch.
---------------------------------------------------------------------------
Version 6.6.0 [v6-stable] 2012-10-22
This starts a new stable branch, based on the 6.5.x series, plus:
@@ -977,6 +979,8 @@ Version 5.10.2 [V5-STABLE], 201?-??-??
... actually, they are microseconds. So the fractional part of the
timestamp was not properly formatted.
Thanks to Marius Tomaschewski for the bug report and the patch idea.
+- bugfix: invalid DST handling under Solaris
+ Thanks to Scott Severtson for the patch.
---------------------------------------------------------------------------
Version 5.10.1 [V5-STABLE], 2012-10-17
- bugfix: imuxsock and imklog truncated head of received message
diff --git a/runtime/datetime.c b/runtime/datetime.c
index 53bc1657..c03abab9 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -77,7 +77,7 @@ timeval2syslogTime(struct timeval *tp, struct syslogTime *t)
/* Solaris uses a different method of exporting the time zone.
* It is UTC - localtime, which is the opposite sign of mins east of GMT.
*/
- lBias = -(daylight ? altzone : timezone);
+ lBias = -(tm->tm_isdst ? altzone : timezone);
# elif defined(__hpux)
lBias = tz.tz_dsttime ? - tz.tz_minuteswest : 0;
# else