svn commit: samba r17834 - in branches/SAMBA_3_0/source/lib: .

[jra at samba.org]

Author: jra
Date: 2006-08-25 16:25:09 +0000 (Fri, 25 Aug 2006)
New Revision: 17834

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17834

Log:
Another bug found by Volker's tests in the build farm !
Correctly map large nt timevals to TIME_T_MAX.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/time.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/time.c
===================================================================
--- branches/SAMBA_3_0/source/lib/time.c	2006-08-25 15:08:05 UTC (rev 17833)
+++ branches/SAMBA_3_0/source/lib/time.c	2006-08-25 16:25:09 UTC (rev 17834)
@@ -223,12 +223,6 @@
 		return ret;
 	}
 
-	if ((nt->high == 0x7fffffff) && (nt->low == 0xffffffff)) {
-		ret.tv_sec = TIME_T_MAX;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
 	d = (((uint64)nt->high) << 32 ) + ((uint64)nt->low);
 	/* d is now in 100ns units, since jan 1st 1601".
 	   Save off the ns fraction. */
@@ -247,7 +241,7 @@
 		return ret;
 	}
 
-	if (((time_t)d) >= TIME_T_MAX) {
+	if ((d >= (uint64)TIME_T_MAX)) {
 		ret.tv_sec = TIME_T_MAX;
 		ret.tv_nsec = 0;
 		return ret;