diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
| commit | 53265e3c7403c290158b70f7efad2b9388a06e6c (patch) | |
| tree | 6fd45b1de23595348f5f011cff83b5877bac4d73 /runtime | |
| parent | 6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.gz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.xz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/datetime.c | 2 |
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 */ } |