64-bit time_t safe lease time

[Martin Blapp]

Hi,

I just got another patch wehich should fix the problems.

Martin

Index: client/dhclient.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/client/dhclient.c,v
retrieving revision 1.37
diff -u -r1.37 dhclient.c
--- client/dhclient.c	26 Jun 2004 10:37:41 -0000	1.37
+++ client/dhclient.c	28 Jun 2004 11:16:11 -0000
@@ -46,7 +46,7 @@
 #include <net80211/ieee80211.h>
 #endif

-TIME cur_time;
+extern TIME cur_time;
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */

Index: common/dispatch.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/common/dispatch.c,v
retrieving revision 1.5
diff -u -r1.5 dispatch.c
--- common/dispatch.c	26 Jun 2004 10:37:41 -0000	1.5
+++ common/dispatch.c	28 Jun 2004 11:16:41 -0000
@@ -95,7 +95,6 @@
 	struct timeval *tvp_new;
 #endif
 	isc_result_t status;
-	TIME cur_time;

 	tvp = NULL;
 #ifdef ENABLE_POLLING_MODE
Index: omapip/dispatch.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/omapip/dispatch.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 dispatch.c
--- omapip/dispatch.c	26 Jun 2004 10:34:24 -0000	1.1.1.2
+++ omapip/dispatch.c	28 Jun 2004 11:11:17 -0000
@@ -35,7 +35,7 @@
 #include <omapip/omapip_p.h>

 static omapi_io_object_t omapi_io_states;
-u_int32_t cur_time;
+TIME cur_time;

 OMAPI_OBJECT_ALLOC (omapi_io,
 		    omapi_io_object_t, omapi_type_io_object)
Index: omapip/mrtrace.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/omapip/mrtrace.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mrtrace.c
--- omapip/mrtrace.c	26 Jun 2004 10:34:24 -0000	1.1.1.2
+++ omapip/mrtrace.c	28 Jun 2004 11:18:26 -0000
@@ -61,7 +61,7 @@
 int trace_mr_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
 unsigned int trace_mr_res_randomid (unsigned int);

-extern time_t cur_time;
+extern TIME cur_time;

 #if defined (TRACING)
 void trace_mr_init ()