svn commit: r265687 - stable/10/sys/kern

[Brooks Davis]

Author: brooks
Date: Thu May  8 16:12:38 2014
New Revision: 265687
URL: http://svnweb.freebsd.org/changeset/base/265687

Log:
  MFC r265201
  
  Fix a 2038 bug.
  
  If time_t is 64-bit (i.e. isn't 32-bit) allow any value of year, not
  just years less than 2038.
  
  Don't bother fixing the underflow in the case of years before 1903.
  
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL

Modified:
  stable/10/sys/kern/subr_clock.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/subr_clock.c
==============================================================================
--- stable/10/sys/kern/subr_clock.c	Thu May  8 15:58:34 2014	(r265686)
+++ stable/10/sys/kern/subr_clock.c	Thu May  8 16:12:38 2014	(r265687)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/clock.h>
+#include <sys/limits.h>
 #include <sys/sysctl.h>
 #include <sys/timetc.h>
 
@@ -147,7 +148,7 @@ clock_ct_to_ts(struct clocktime *ct, str
 	if (ct->mon < 1 || ct->mon > 12 || ct->day < 1 ||
 	    ct->day > days_in_month(year, ct->mon) ||
 	    ct->hour > 23 ||  ct->min > 59 || ct->sec > 59 ||
-	    ct->year > 2037) {		/* time_t overflow */
+	    (sizeof(time_t) == 4 && year > 2037)) {	/* time_t overflow */
 		if (ct_debug)
 			printf(" = EINVAL\n");
 		return (EINVAL);