From owner-freebsd-current@FreeBSD.ORG  Sat Aug  9 09:21:51 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CD67737B405
	for <freebsd-current@freebsd.org>;
	Sat,  9 Aug 2003 09:21:51 -0700 (PDT)
Received: from mail.imp.ch (mail.imp.ch [157.161.1.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2A71543FE3
	for <freebsd-current@freebsd.org>;
	Sat,  9 Aug 2003 09:21:50 -0700 (PDT)	(envelope-from mb@imp.ch)
Received: from nbs.imp.ch (nbs.imp.ch [157.161.4.7])
	by mail.imp.ch (8.12.6p2/8.12.3) with ESMTP id h79GLiYc015291;
	Sat, 9 Aug 2003 18:21:45 +0200 (CEST)
	(envelope-from Martin.Blapp@imp.ch)
Received: from cvs.imp.ch (cvs.imp.ch [157.161.4.9])
	by nbs.imp.ch (8.12.8/8.12.3) with ESMTP id h79GLilH8840198;
	Sat, 9 Aug 2003 18:21:44 +0200 (MES)
Date: Sat, 9 Aug 2003 18:21:43 +0200 (CEST)
From: Martin Blapp <mb@imp.ch>
To: "Matthew N. Dodd" <winter@jurai.net>
In-Reply-To: <20030809090403.N87665@sasami.jurai.net>
Message-ID: <20030809182031.H89102@cvs.imp.ch>
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>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: Craig Rodrigues <rodrigc@crodrigues.org>
cc: freebsd-current@freebsd.org
Subject: Re: dhclient problem with xl0
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2003 16:21:52 -0000


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
------------------------------------------------------------------