cvs commit: src/usr.sbin/sysinstall tcpip.c

[Ceri Davies]

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
> > 
> >   FreeBSD src repository
> > 
> >   Modified files:
> >     usr.sbin/sysinstall  tcpip.c 
> >   Log:
> >   Attempt to fix DHCP address acquisition which was broken by rev. 1.133.
> 
> > | @@ -596,9 +596,12 @@ netconfig:
> > |  	    ipv4_enable = 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);
> 
> 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
-- 
That must be wonderful!  I don't understand it at all.
                                                  -- Moliere
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20060206/f150af02/attachment.bin