summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-16 17:53:29 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-16 17:53:29 +0200
commit3135b3335d711c2638f1fedc867fb966008e2361 (patch)
treeca5215f503568a7cacca485d39e776b7530f4120 /runtime
parenta201de795ad630ddf81fea9f7bbb13ad79bdfff4 (diff)
parentda52cbae520e747568162ad558bf01d40658c745 (diff)
downloadrsyslog-3135b3335d711c2638f1fedc867fb966008e2361.tar.gz
rsyslog-3135b3335d711c2638f1fedc867fb966008e2361.tar.xz
rsyslog-3135b3335d711c2638f1fedc867fb966008e2361.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: runtime/datetime.c
Diffstat (limited to 'runtime')
-rw-r--r--runtime/datetime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/datetime.c b/runtime/datetime.c
index eff72f91..593c3d5c 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -122,7 +122,7 @@ static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
else
t->OffsetMode = '+';
t->OffsetHour = lBias / 3600;
- t->OffsetMinute = lBias % 3600;
+ t->OffsetMinute = (lBias % 3600) / 60;
t->timeType = TIME_TYPE_RFC5424; /* we have a high precision timestamp */
}