Date: Sat, 26 Jun 2004 14:31:44 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) To: Martin Blapp <mbr@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources Message-ID: <xzp4qoy5wlr.fsf@dwp.des.no> In-Reply-To: <200406261034.i5QAYQIv058242@repoman.freebsd.org> (Martin Blapp's message of "Sat, 26 Jun 2004 10:34:26 %2B0000 (UTC)") References: <200406261034.i5QAYQIv058242@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Martin Blapp <mbr@FreeBSD.org> writes:
> Log Message:
> Import ISC DHCP 3.0.1 RC14 client.
Please consider committing the attached patch, which is necessary for
dhclient to work on platforms with a 64-bit time_t. It's been waiting
since February (msgid <xzpznbbwfxb.fsf@dwp.des.no> on freebsd-sparc64)
DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=isc-dhcp.diff
Index: contrib/isc-dhcp/common/parse.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/common/parse.c,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 parse.c
--- contrib/isc-dhcp/common/parse.c 26 Jun 2004 10:34:20 -0000 1.1.1.9
+++ contrib/isc-dhcp/common/parse.c 26 Jun 2004 12:23:34 -0000
@@ -405,6 +405,7 @@
{
const char *val;
enum dhcp_token token;
+ int32_t num;
token = next_token (&val, (unsigned *)0, cfile);
if (token != NUMBER) {
@@ -412,9 +413,9 @@
skip_to_semi (cfile);
return;
}
- convert_num (cfile, (unsigned char *)timep, val, 10, 32);
+ convert_num (cfile, (unsigned char *)&num, val, 10, 32);
/* Unswap the number - convert_num returns stuff in NBO. */
- *timep = ntohl (*timep); /* XXX */
+ *timep = ntohl (num);
parse_semi (cfile);
}
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzp4qoy5wlr.fsf>