From 7a6ba664cbbe7e3b704d9ce6e857a1bcae32fead Mon Sep 17 00:00:00 2001 From: Antonio Huete Jimenez Date: Thu, 2 Aug 2012 20:13:02 +0200 Subject: [PATCH] dhclient - Add and ignore DHCP option 66/0x42 TFTP server name. Taken-from: OpenBSD --- sbin/dhclient/dhclient.c | 3 ++- sbin/dhclient/dhcp.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index a9ba6704ea..79baeec92e 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: src/sbin/dhclient/dhclient.c,v 1.136 2010/09/24 13:44:14 claudio Exp $ */ +/* $OpenBSD: src/sbin/dhclient/dhclient.c,v 1.137 2010/10/15 09:51:15 jsg Exp $ */ /* * Copyright 2004 Henning Brauer @@ -2041,6 +2041,7 @@ check_option(struct client_lease *l, int option) case DHO_DHCP_CLASS_IDENTIFIER: case DHO_DHCP_CLIENT_IDENTIFIER: case DHO_DHCP_USER_CLASS_ID: + case DHO_TFTP_SERVER: case DHO_END: return (1); default: diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h index b1bb20f6c9..02ff9f66d5 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -1,5 +1,4 @@ -/* $OpenBSD: dhcp.h,v 1.7 2007/02/01 22:39:43 krw Exp $ */ -/* $DragonFly: src/sbin/dhclient/dhcp.h,v 1.1 2008/08/30 16:07:58 hasso Exp $ */ +/* $OpenBSD: src/sbin/dhclient/dhcp.h,v 1.8 2010/10/15 09:51:15 jsg Exp $ */ /* Protocol structures... */ @@ -153,6 +152,7 @@ struct dhcp_packet { #define DHO_DHCP_REBINDING_TIME 59 #define DHO_DHCP_CLASS_IDENTIFIER 60 #define DHO_DHCP_CLIENT_IDENTIFIER 61 +#define DHO_TFTP_SERVER 66 #define DHO_DHCP_USER_CLASS_ID 77 #define DHO_END 255 -- 2.41.0