From b388f1cb106d0d632e4b473965c76725dc7ed878 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 30 Jun 2005 05:32:42 +0000 Subject: [PATCH] People like to do RFC violating things with the domain-name option and include a space seperated list of domains instead of the domain of the host. This is supported on too many platforms to break for now so, remove validation of this option for the moment. The correct solution longer term is to implement RFC 3397 support and then treat domain-name options containing space seperated lists of domains as domain-search options for backwards compatability. Approved by: re (dhclient blanket) --- sbin/dhclient/dhclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 24bf88bdf4ac..3147d6191fb4 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2234,7 +2234,6 @@ check_option(struct client_lease *l, int option) } return (1) ; case DHO_HOST_NAME: - case DHO_DOMAIN_NAME: case DHO_NIS_DOMAIN: if (!res_hnok(sbuf)) { warning("Bogus Host Name option %d: %s (%s)", option, @@ -2242,6 +2241,7 @@ check_option(struct client_lease *l, int option) return (0); } return (1); + case DHO_DOMAIN_NAME: case DHO_PAD: case DHO_TIME_OFFSET: case DHO_BOOT_SIZE: