From 34278af77abe570f4046dba16a2cb8aec8ed00d4 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 20 May 2002 16:55:00 +0000 Subject: merge from SAMBA_2_2 (This used to be commit 2424578c298ea11f67415bcfe2928353cd95819b) --- source3/lib/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/time.c') 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; -- cgit