summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-09 02:54:07 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-09 02:54:07 +0000
commit7309f50062a11e38f3e697cd3ced68333d55e63d (patch)
tree0027f3afce4b09b292a8f87d45b2a2bade7d4ae0
parente81fcebb2e135d880e60beff659621a4391a2d33 (diff)
downloadsamba-7309f50062a11e38f3e697cd3ced68333d55e63d.tar.gz
samba-7309f50062a11e38f3e697cd3ced68333d55e63d.tar.xz
samba-7309f50062a11e38f3e697cd3ced68333d55e63d.zip
applied patch from bug#140
this fixes a timestamp problem with 64 bit machines (This used to be commit 0ce6eddad8e148bc6d195ddefb773326339d06e6)
-rw-r--r--source3/lib/time.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index f76a1bdc0d8..5309711a056 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -308,7 +308,8 @@ time_t nt_time_to_unix(NTTIME *nt)
time_t l_time_min = TIME_T_MIN;
time_t l_time_max = TIME_T_MAX;
- if (nt->high == 0) return(0);
+ if (nt->high == 0 || (nt->high == 0xffffffff && nt->low == 0xffffffff))
+ return(0);
d = ((double)nt->high)*4.0*(double)(1<<30);
d += (nt->low&0xFFF00000);