summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-11-06 01:55:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:19 -0500
commit47873110838038a864c964682b3bd200ce977f88 (patch)
tree6edb2a4045dda2d7365a466991144b488c35bea6 /source3/lib
parent6d5757395a0e54245543794d0d6d6d6a32cd857a (diff)
downloadsamba-47873110838038a864c964682b3bd200ce977f88.tar.gz
samba-47873110838038a864c964682b3bd200ce977f88.tar.bz2
samba-47873110838038a864c964682b3bd200ce977f88.zip
r11530: Add the "time offset" parameter back in for people who
might use it. Jeremy. (This used to be commit b745114423a482ea8cd1ea4f80ec3fc2a9caa971)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 2bc4d47143..989589121b 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -104,7 +104,7 @@ int get_time_zone(time_t t)
if (!tm) {
return 0;
}
- return tm_diff(&tm_utc,tm);
+ return tm_diff(&tm_utc,tm) + 60*extra_time_offset;
}
/*******************************************************************