merge from SAMBA_2_2

diff --git a/source/lib/time.c b/source/lib/time.c
index 5fc43612dd5af134fd02bfc9571a9739f9dcb11c..9df4763b4c3b1787a54e147829ec06e99f898bfd 100644 (file)
--- a/source/lib/time.c
+++ b/source/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;