Change host-name from type "X" to type "t". This allows the client to
accept NUL-terminated strings as required by RFC 2132. This solution is not perfect as it removes the ability to send NUL-terminated host-name options which may be required by some broken servers. Given the current lack of an existance proof of such servers and the fact that servers that send NUL-terminated domain names do exist, this seems like an acceptable compromise. A discussion of these issues can be found at: http://marc.theaimsgroup.com/?l=dhcp-client&m=96837107208382&w=2 PR: bin/83468 Reported by: Sean Winn <sean at gothic dot net dot au> MFC-after: 3 days
This commit is contained in:
parent
8827c821de
commit
a65d8df916
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=148411
@ -1,4 +1,5 @@
|
|||||||
/* $OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $ */
|
/* $OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $ */
|
||||||
|
/* $FreeBSD$ */
|
||||||
|
|
||||||
/* Tables of information... */
|
/* Tables of information... */
|
||||||
|
|
||||||
@ -74,7 +75,7 @@ struct option dhcp_options[256] = {
|
|||||||
{ "lpr-servers", "IA", &dhcp_universe, 9 },
|
{ "lpr-servers", "IA", &dhcp_universe, 9 },
|
||||||
{ "impress-servers", "IA", &dhcp_universe, 10 },
|
{ "impress-servers", "IA", &dhcp_universe, 10 },
|
||||||
{ "resource-location-servers", "IA", &dhcp_universe, 11 },
|
{ "resource-location-servers", "IA", &dhcp_universe, 11 },
|
||||||
{ "host-name", "X", &dhcp_universe, 12 },
|
{ "host-name", "t", &dhcp_universe, 12 },
|
||||||
{ "boot-size", "S", &dhcp_universe, 13 },
|
{ "boot-size", "S", &dhcp_universe, 13 },
|
||||||
{ "merit-dump", "t", &dhcp_universe, 14 },
|
{ "merit-dump", "t", &dhcp_universe, 14 },
|
||||||
{ "domain-name", "t", &dhcp_universe, 15 },
|
{ "domain-name", "t", &dhcp_universe, 15 },
|
||||||
|
Loading…
Reference in New Issue
Block a user