Date: Sat, 9 Aug 2003 18:21:43 +0200 (CEST) From: Martin Blapp <mb@imp.ch> To: "Matthew N. Dodd" <winter@jurai.net> Cc: freebsd-current@freebsd.org Subject: Re: dhclient problem with xl0 Message-ID: <20030809182031.H89102@cvs.imp.ch> In-Reply-To: <20030809090403.N87665@sasami.jurai.net> References: <20030809072050.GA7547@crodrigues.org> <20030809122637.D49451@cvs.imp.ch><20030809143707.A49451@cvs.imp.ch> <20030809144556.E49451@cvs.imp.ch> <20030809090403.N87665@sasami.jurai.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, Adapted to the newst source-version, the patch will look like this. After I got home, I'll test it. Martin Index: client/dhclient.c =================================================================== RCS file: /home/ncvs/src/contrib/isc-dhcp/client/dhclient.c,v retrieving revision 1.30 diff -u -r1.30 dhclient.c --- client/dhclient.c 7 Aug 2003 14:58:46 -0000 1.30 +++ client/dhclient.c 9 Aug 2003 16:20:22 -0000 @@ -3288,19 +3288,21 @@ return (HAVELINK); } } - } - /* - * If dhclient.conf contains media settings, we cannot - * abort if the interface is not set to active mode. - */ - if (ip -> havemedia && ip -> client -> state != S_BOUND) - return (HAVELINK); + /* + * If dhclient.conf contains media settings, we cannot + * abort if the interface is not set to active mode. + */ + if (ip -> havemedia && ip -> client -> state != S_BOUND) + return (HAVELINK); - /* - * We really have no link. - */ - return (NOLINK); + /* + * We really have no link. + */ + return (NOLINK); + } + + return (HAVELINK); #else /* ifdef __FreeBSD__ */ /* @@ -3310,6 +3312,7 @@ return (HAVELINK); #endif /* Other OSs */ } + #ifdef __FreeBSD__ void Martin Blapp, <mb@imp.ch> <mbr@FreeBSD.org> ------------------------------------------------------------------ ImproWare AG, UNIXSP & ISP, Zurlindenstrasse 29, 4133 Pratteln, CH Phone: +41 61 826 93 00 Fax: +41 61 826 93 01 PGP: <finger -l mbr@freebsd.org> PGP Fingerprint: B434 53FC C87C FE7B 0A18 B84C 8686 EF22 D300 551E ------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030809182031.H89102>