summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2005-07-25 22:19:09 +0000
committerbrooks <brooks@FreeBSD.org>2005-07-25 22:19:09 +0000
commit4917ccafd29dc4922c594f4a94d1407eadeb36ac (patch)
treee7468a1dbfeec49784c80f2edcf39aede2970755 /sbin
parent388b4d6c8dc46d6be4f2e6790d5fbba31397395d (diff)
downloadFreeBSD-src-4917ccafd29dc4922c594f4a94d1407eadeb36ac.zip
FreeBSD-src-4917ccafd29dc4922c594f4a94d1407eadeb36ac.tar.gz
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
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dhclient/tables.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 6648756..93ff6ac 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -1,4 +1,5 @@
/* $OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $ */
+/* $FreeBSD$ */
/* Tables of information... */
@@ -74,7 +75,7 @@ struct option dhcp_options[256] = {
{ "lpr-servers", "IA", &dhcp_universe, 9 },
{ "impress-servers", "IA", &dhcp_universe, 10 },
{ "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 },
{ "merit-dump", "t", &dhcp_universe, 14 },
{ "domain-name", "t", &dhcp_universe, 15 },
OpenPOWER on IntegriCloud