diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-10-15 09:51:16 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-10-15 09:51:16 +0000 |
| commit | cd40ba0cfbb9c6b94e74502c33c17184853e769f (patch) | |
| tree | acf0935ade0c60e0bc3a8dd6df6efb4a3d6cc618 /sbin | |
| parent | 01cde4cc631484501562ad1648afe4c3317b0519 (diff) | |
Add and ignore DHCP option 66/0x42 TFTP server name.
ok krw@ phessler@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/dhcp.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 950ab08de95..b2abea4e9f3 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.136 2010/09/24 13:44:14 claudio Exp $ */ +/* $OpenBSD: dhclient.c,v 1.137 2010/10/15 09:51:15 jsg Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -2059,6 +2059,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 f5ac79ad8ad..e1394283972 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcp.h,v 1.7 2007/02/01 22:39:43 krw Exp $ */ +/* $OpenBSD: dhcp.h,v 1.8 2010/10/15 09:51:15 jsg Exp $ */ /* Protocol structures... */ @@ -152,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 |