|
 |
e83fb19 |
diff -up dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse dhcp-4.3.0a1/common/parse.c
|
|
|
e83fb19 |
--- dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse 2013-12-11 01:25:12.000000000 +0100
|
|
|
e83fb19 |
+++ dhcp-4.3.0a1/common/parse.c 2013-12-19 15:45:25.990771814 +0100
|
|
|
e83fb19 |
@@ -938,8 +938,8 @@ TIME
|
|
|
45c0371 |
parse_date_core(cfile)
|
|
|
45c0371 |
struct parse *cfile;
|
|
|
45c0371 |
{
|
|
|
45c0371 |
- int guess;
|
|
|
d5d042f |
- int tzoff, year, mon, mday, hour, min, sec;
|
|
|
45c0371 |
+ TIME guess;
|
|
|
d5d042f |
+ long int tzoff, year, mon, mday, hour, min, sec;
|
|
|
45c0371 |
const char *val;
|
|
|
45c0371 |
enum dhcp_token token;
|
|
|
45c0371 |
static int months[11] = { 31, 59, 90, 120, 151, 181,
|
|
|
e83fb19 |
@@ -965,7 +965,7 @@ parse_date_core(cfile)
|
|
|
45c0371 |
}
|
|
|
45c0371 |
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume number */
|
|
|
45c0371 |
- guess = atoi(val);
|
|
|
45c0371 |
+ guess = atol(val);
|
|
|
45c0371 |
|
|
|
45c0371 |
return((TIME)guess);
|
|
|
45c0371 |
}
|
|
|
e83fb19 |
@@ -993,7 +993,7 @@ parse_date_core(cfile)
|
|
|
45c0371 |
somebody invents a time machine, I think we can safely disregard
|
|
|
45c0371 |
it. This actually works around a stupid Y2K bug that was present
|
|
|
45c0371 |
in a very early beta release of dhcpd. */
|
|
|
45c0371 |
- year = atoi(val);
|
|
|
45c0371 |
+ year = atol(val);
|
|
|
45c0371 |
if (year > 1900)
|
|
|
45c0371 |
year -= 1900;
|
|
|
45c0371 |
|
|
|
e83fb19 |
@@ -1039,7 +1039,7 @@ parse_date_core(cfile)
|
|
|
45c0371 |
return((TIME)0);
|
|
|
45c0371 |
}
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume day of month */
|
|
|
45c0371 |
- mday = atoi(val);
|
|
|
45c0371 |
+ mday = atol(val);
|
|
|
45c0371 |
|
|
|
45c0371 |
/* Hour... */
|
|
|
45c0371 |
token = peek_token(&val, NULL, cfile);
|
|
|
e83fb19 |
@@ -1050,7 +1050,7 @@ parse_date_core(cfile)
|
|
|
45c0371 |
return((TIME)0);
|
|
|
45c0371 |
}
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume hour */
|
|
|
45c0371 |
- hour = atoi(val);
|
|
|
45c0371 |
+ hour = atol(val);
|
|
|
45c0371 |
|
|
|
45c0371 |
/* Colon separating hour from minute... */
|
|
|
45c0371 |
token = peek_token(&val, NULL, cfile);
|
|
|
e83fb19 |
@@ -1072,7 +1072,7 @@ parse_date_core(cfile)
|
|
|
45c0371 |
return((TIME)0);
|
|
|
45c0371 |
}
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume minute */
|
|
|
45c0371 |
- min = atoi(val);
|
|
|
45c0371 |
+ min = atol(val);
|
|
|
45c0371 |
|
|
|
45c0371 |
/* Colon separating minute from second... */
|
|
|
45c0371 |
token = peek_token(&val, NULL, cfile);
|
|
|
e83fb19 |
@@ -1094,13 +1094,13 @@ parse_date_core(cfile)
|
|
|
45c0371 |
return((TIME)0);
|
|
|
45c0371 |
}
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume second */
|
|
|
45c0371 |
- sec = atoi(val);
|
|
|
45c0371 |
+ sec = atol(val);
|
|
|
45c0371 |
|
|
|
45c0371 |
tzoff = 0;
|
|
|
45c0371 |
token = peek_token(&val, NULL, cfile);
|
|
|
45c0371 |
if (token == NUMBER) {
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile); /* consume tzoff */
|
|
|
45c0371 |
- tzoff = atoi(val);
|
|
|
45c0371 |
+ tzoff = atol(val);
|
|
|
45c0371 |
} else if (token != SEMI) {
|
|
|
e83fb19 |
skip_token(&val, NULL, cfile);
|
|
|
45c0371 |
parse_warn(cfile,
|