From owner-cvs-src@FreeBSD.ORG  Mon Feb  6 18:12:49 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1DDA716A420;
	Mon,  6 Feb 2006 18:12:49 +0000 (GMT)
	(envelope-from ceri@submonkey.net)
Received: from shrike.submonkey.net (cpc2-cdif2-3-1-cust208.cdif.cable.ntl.com
	[82.31.78.208])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2931343D4C;
	Mon,  6 Feb 2006 18:12:47 +0000 (GMT)
	(envelope-from ceri@submonkey.net)
Received: from ceri by shrike.submonkey.net with local (Exim 4.60 (FreeBSD))
	(envelope-from <ceri@submonkey.net>)
	id 1F6Ar0-000I6t-Gh; Mon, 06 Feb 2006 18:12:46 +0000
Date: Mon, 6 Feb 2006 18:12:46 +0000
From: Ceri Davies <ceri@submonkey.net>
To: Xin LI <delphij@FreeBSD.org>, src-committers@FreeBSD.org,
	cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Message-ID: <20060206181246.GK21499@submonkey.net>
Mail-Followup-To: Ceri Davies <ceri@submonkey.net>,
	Xin LI <delphij@FreeBSD.org>, src-committers@FreeBSD.org,
	cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
References: <200602060649.k166nvJL015878@repoman.freebsd.org>
	<20060206162626.GJ21499@submonkey.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="z4+8/lEcDcG5Ke9S"
Content-Disposition: inline
In-Reply-To: <20060206162626.GJ21499@submonkey.net>
X-PGP: finger ceri@FreeBSD.org
User-Agent: Mutt/1.5.11
Sender: Ceri Davies <ceri@submonkey.net>
Cc: 
Subject: Re: cvs commit: src/usr.sbin/sysinstall tcpip.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2006 18:12:49 -0000


--z4+8/lEcDcG5Ke9S
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Feb 06, 2006 at 04:26:26PM +0000, Ceri Davies wrote:
> On Mon, Feb 06, 2006 at 06:49:57AM +0000, Xin LI wrote:
> > delphij     2006-02-06 06:49:57 UTC
> >=20
> >   FreeBSD src repository
> >=20
> >   Modified files:
> >     usr.sbin/sysinstall  tcpip.c=20
> >   Log:
> >   Attempt to fix DHCP address acquisition which was broken by rev. 1.13=
3.
>=20
> > | @@ -596,9 +596,12 @@ netconfig:
> > |  	    ipv4_enable =3D TRUE;
> > |  	if (ipv4_enable) {
> > |  	    sprintf(ifn, "%s%s", VAR_IFCONFIG, devp->name);
> > | -	    if (use_dhcp)
> > | -		sprintf(temp, "DHCP %s", extras);
> > | -	    else
> > | +	    if (use_dhcp) {
> > | +		if (strlen(extras) > 0)
> > | +		    sprintf(temp, "DHCP %s", extras);
> > | +		else
> > | +		    sprintf(temp, "DHCP");
> > | +	    } else
> > |  		sprintf(temp, "inet %s %s netmask %s",
> > |  			ipaddr, extras, netmask);
> > |  	    variable_set2(ifn, temp, 1);
>=20
> Can you explain the failure mode?
> network.subr doesn't deal with trailing spaces or something?

Not to worry; I see it now.  I suspect that using strstr or the like at
line 129 of network.c would be a little more resilient though.

Ceri
--=20
That must be wonderful!  I don't understand it at all.
                                                  -- Moliere

--z4+8/lEcDcG5Ke9S
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQFD55GeocfcwTS3JF8RAucwAKC75IrOr3jDndnvyW61FegrozH4EgCaA060
oxjvZ1s+NsfoaqQX0A0kCDQ=
=LkWF
-----END PGP SIGNATURE-----

--z4+8/lEcDcG5Ke9S--