diff options
| author | David Hankins <dhankins@isc.org> | 2005-09-28 18:58:27 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2005-09-28 18:58:27 +0000 |
| commit | 450a30a85a12a07dc08e59559e82a345a91c8293 (patch) | |
| tree | ae3e02ceb4e0a193021eabb30464d042c160c7a0 | |
| parent | fc9c4a669a50a58c16e9a360164ee80ca0dc87a2 (diff) | |
| download | isc-dhcp-450a30a85a12a07dc08e59559e82a345a91c8293.tar.gz | |
- Ignore SIT, IRDA, and IEEE1394 interfaces, as they are either nonsensical
for DHCP or unsupported (as in the case of 1394). [ISC-Bugs #15464]
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | common/discover.c | 14 | ||||
| -rw-r--r-- | includes/osdep.h | 14 |
3 files changed, 30 insertions, 2 deletions
@@ -85,6 +85,10 @@ and for prodding me into improving it. the db, it will go ahead with the operation and move the new db into place once it detects the old db does not exist. +- dhclient now ignores IRDA, SIT, and IEEE1394 network interfaces, as it + is either nonsensical or (in the case of IEEE1394) is not known to support + these interfaces. Thanks to Marius Gedminas and Andrew Pollock of Debian. + Changes since 3.0.3b3 - dhclient.conf documentation for interface {} was updated to reflect recent diff --git a/common/discover.c b/common/discover.c index a94877ef..fba6c766 100644 --- a/common/discover.c +++ b/common/discover.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: discover.c,v 1.42.2.18 2005/08/26 22:45:45 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; +"$Id: discover.c,v 1.42.2.19 2005/09/28 18:58:27 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -462,6 +462,18 @@ void discover_interfaces (state) #ifdef HAVE_ARPHRD_ROSE case ARPHRD_ROSE: #endif +#ifdef HAVE_ARPHRD_IRDA + case ARPHRD_IRDA: + /* ignore infrared interfaces. */ +#endif +#ifdef HAVE_ARPHRD_SIT + case ARPHRD_SIT: + /* ignore IPv6-in-IPv4 interfaces. */ +#endif +#ifdef HAVE_ARPHRD_IEEE1394 + case ARPHRD_IEEE1394: + /* ignore IEEE1394 interfaces. */ +#endif #ifdef HAVE_ARPHRD_LOOPBACK case ARPHRD_LOOPBACK: /* ignore loopback interface */ diff --git a/includes/osdep.h b/includes/osdep.h index 5d1bc912..d5f47a76 100644 --- a/includes/osdep.h +++ b/includes/osdep.h @@ -3,7 +3,7 @@ Operating system dependencies... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -271,6 +271,18 @@ # define HAVE_ARPHRD_ROSE #endif +#if defined (ARPHRD_IRDA) && !defined (HAVE_ARPHRD_IRDA) +# define HAVE_ARPHRD_IRDA +#endif + +#if defined (ARPHRD_SIT) && !defined (HAVE_ARPHRD_SIT) +# define HAVE_ARPHRD_SIT +#endif + +#if defined (ARPHRD_IEEE1394) & !defined (HAVE_ARPHRD_IEEE1394) +# define HAVE_ARPHRD_IEEE1394 +#endif + #if defined (ARPHRD_IEEE802) && !defined (HAVE_ARPHRD_IEEE802) # define HAVE_ARPHRD_IEEE802 #endif |