diff options
author | Gerald Carter <jerry@samba.org> | 2002-05-20 16:55:00 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-05-20 16:55:00 +0000 |
commit | 34278af77abe570f4046dba16a2cb8aec8ed00d4 (patch) | |
tree | 93fad4ec9fe09bb4d5b8a53550518d2e17bd902f /source3 | |
parent | 641d6dc79e5d16e1fdb6c0986ea850dffddb7d86 (diff) | |
download | samba-34278af77abe570f4046dba16a2cb8aec8ed00d4.tar.gz samba-34278af77abe570f4046dba16a2cb8aec8ed00d4.tar.bz2 samba-34278af77abe570f4046dba16a2cb8aec8ed00d4.zip |
merge from SAMBA_2_2
(This used to be commit 2424578c298ea11f67415bcfe2928353cd95819b)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/lib/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c index 5fc43612dd..9df4763b4c 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -413,7 +413,7 @@ void unix_to_nt_time(NTTIME *nt, time_t t) } /* this converts GMT to kludge-GMT */ - t -= LocTimeDiff(t) - get_serverzone(); + t -= TimeDiff(t) - get_serverzone(); d = (double)(t); d += TIME_FIXUP_CONSTANT; |