d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't complain when we receive smtp, pop, nntp, www, finger, and irc

Browse Source 
server options.

Reported by:	Max Boyarov <max_b at tut dot by>
Approved by:	re (dhclient blanket)
This commit is contained in:
Brooks Davis 2005-06-30 05:50:52 +00:00
parent 0ed48524c1
commit a36c0b6b78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147689
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/dhclient/dhclient.c
View File

@ -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);

7
sbin/dhclient/dhcp.h
View File

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