dhclient problem with xl0

[Martin Blapp]

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 at imp.ch> <mbr at 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 at freebsd.org>
PGP Fingerprint: B434 53FC C87C FE7B 0A18 B84C 8686 EF22 D300 551E
------------------------------------------------------------------