diff options
| author | brooks <brooks@FreeBSD.org> | 2005-06-30 05:50:52 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2005-06-30 05:50:52 +0000 |
| commit | fd1962d203df3216f2b228420a9d3f04148f5333 (patch) | |
| tree | 1c53a27880bd77027efb3993e1bc8e2bdb2a9461 | |
| parent | 25ee01e298720acd15cfe923f0e6302fc83b802c (diff) | |
| download | FreeBSD-src-fd1962d203df3216f2b228420a9d3f04148f5333.zip FreeBSD-src-fd1962d203df3216f2b228420a9d3f04148f5333.tar.gz | |
Don't complain when we receive smtp, pop, nntp, www, finger, and irc
server options.
Reported by: Max Boyarov <max_b at tut dot by>
Approved by: re (dhclient blanket)
| -rw-r--r-- | sbin/dhclient/dhclient.c | 6 | ||||
| -rw-r--r-- | sbin/dhclient/dhcp.h | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 3147d61..5e5cf79 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2228,6 +2228,12 @@ check_option(struct client_lease *l, int option) case DHO_NETBIOS_DD_SERVER: case DHO_FONT_SERVERS: case DHO_DHCP_SERVER_IDENTIFIER: + case DHO_SMTP_SERVER: + case DHO_POP_SERVER: + case DHO_NNTP_SERVER: + case DHO_WWW_SERVER: + case DHO_FINGER_SERVER: + case DHO_IRC_SERVER: if (!ipv4addrs(opbuf)) { warning("Invalid IP address in option: %s", opbuf); return (0); diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h index 33f5122..db1c05c 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -1,4 +1,5 @@ /* $OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $ */ +/* $FreeBSD$ */ /* Protocol structures... */ @@ -154,6 +155,12 @@ struct dhcp_packet { #define DHO_DHCP_REBINDING_TIME 59 #define DHO_DHCP_CLASS_IDENTIFIER 60 #define DHO_DHCP_CLIENT_IDENTIFIER 61 +#define DHO_SMTP_SERVER 69 +#define DHO_POP_SERVER 70 +#define DHO_NNTP_SERVER 71 +#define DHO_WWW_SERVER 72 +#define DHO_FINGER_SERVER 73 +#define DHO_IRC_SERVER 74 #define DHO_DHCP_USER_CLASS_ID 77 #define DHO_END 255 |
