From owner-cvs-all@FreeBSD.ORG  Sat Jun 26 12:32:24 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8E02416A4CE; Sat, 26 Jun 2004 12:32:24 +0000 (GMT)
Received: from smtp.des.no (flood.des.no [217.116.83.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5693243D48; Sat, 26 Jun 2004 12:32:24 +0000 (GMT)
	(envelope-from des@des.no)
Received: by smtp.des.no (Pony Express, from userid 666)
	id A5606530C; Sat, 26 Jun 2004 14:32:08 +0200 (CEST)
Received: from dwp.des.no (des.no [80.203.228.37])
	by smtp.des.no (Pony Express) with ESMTP
	id 2961A5309; Sat, 26 Jun 2004 14:31:45 +0200 (CEST)
Received: by dwp.des.no (Postfix, from userid 2602)
	id C9824B86C; Sat, 26 Jun 2004 14:31:44 +0200 (CEST)
To: Martin Blapp <mbr@FreeBSD.org>
References: <200406261034.i5QAYQIv058242@repoman.freebsd.org>
From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
Date: Sat, 26 Jun 2004 14:31:44 +0200
In-Reply-To: <200406261034.i5QAYQIv058242@repoman.freebsd.org> (Martin
 Blapp's message of "Sat, 26 Jun 2004 10:34:26 +0000 (UTC)")
Message-ID: <xzp4qoy5wlr.fsf@dwp.des.no>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on flood.des.no
X-Spam-Level: 
X-Spam-Status: No, hits=0.0 required=5.0 tests=AWL autolearn=no version=2.63
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jun 2004 12:32:24 -0000

--=-=-=
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);
 }

--=-=-=--