diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
| commit | 475eb28e551f1b12ebde3b2f2ddb2c33403f192c (patch) | |
| tree | 247b9f1beab50d0355be1151b4e45d6da3260333 /runtime/datetime.c | |
| parent | c561994c108627c490729d98d671c45b4f9684e5 (diff) | |
| parent | b3dae5cff321e066bacc5e03846c77f832004006 (diff) | |
| download | rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.tar.gz rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.tar.xz rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/datetime.c')
| -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 de26762d..f81180ea 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 */ } |