Stop pretending we still support FDDI or token ring hardware types.

idea ok deraadt@ matthew@

8 files changed, 9 insertions, 34 deletions

diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3d9ee1353f3..5cccce5098d 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conflex.c,v 1.24 2013/11/12 04:59:00 deraadt Exp $	*/
+/*	$OpenBSD: conflex.c,v 1.25 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Lexical scanner for dhclient config file. */
 
@@ -326,7 +326,6 @@ static const struct keywords {
 	{ "deny",				TOK_DENY },
 	{ "ethernet",				TOK_ETHERNET },
 	{ "expire",				TOK_EXPIRE },
-	{ "fddi",				TOK_FDDI },
 	{ "filename",				TOK_FILENAME },
 	{ "fixed-address",			TOK_FIXED_ADDR },
 	{ "hardware",				TOK_HARDWARE },
@@ -351,8 +350,7 @@ static const struct keywords {
 	{ "send",				TOK_SEND },
 	{ "server-name",			TOK_SERVER_NAME },
 	{ "supersede",				TOK_SUPERSEDE },
-	{ "timeout",				TOK_TIMEOUT },
-	{ "token-ring",				TOK_TOKEN_RING }
+	{ "timeout",				TOK_TIMEOUT }
 };
 
 int	kw_cmp(const void *k, const void *e);
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index 53f8a0440fa..586e1c9044b 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcp.h,v 1.15 2013/06/09 16:21:50 krw Exp $	*/
+/*	$OpenBSD: dhcp.h,v 1.16 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Protocol structures. */
 
@@ -81,8 +81,6 @@ struct dhcp_packet {
 
 /* Possible values for hardware type (htype) field. */
 #define HTYPE_ETHER		1	/* Ethernet			*/
-#define HTYPE_IEEE802		6	/* IEEE 802.2 Token Ring	*/
-#define HTYPE_FDDI		8	/* FDDI				*/
 #define HTYPE_IPSEC_TUNNEL	31	/* IPsec Tunnel (RFC3456)	*/
 
 /* Magic cookie validating dhcp options field (and bootp vendor
diff --git a/sbin/dhclient/dhctoken.h b/sbin/dhclient/dhctoken.h
index cfd41f0a3dc..2c962b9fe42 100644
--- a/sbin/dhclient/dhctoken.h
+++ b/sbin/dhclient/dhctoken.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhctoken.h,v 1.8 2013/10/22 18:15:59 krw Exp $	*/
+/*	$OpenBSD: dhctoken.h,v 1.9 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Tokens for config file lexer and parser. */
 
@@ -52,7 +52,6 @@
 #define TOK_NAME		265
 #define TOK_LEASE		266
 #define TOK_SERVER_NAME		267
-#define TOK_TOKEN_RING		268
 #define TOK_SEND		269
 #define TOK_REQUEST		270
 #define TOK_REQUIRE		271
@@ -77,7 +76,6 @@
 #define TOK_APPEND		290
 #define TOK_PREPEND		291
 #define TOK_REJECT		292
-#define TOK_FDDI		293
 #define TOK_LINK_TIMEOUT	294
 #define TOK_IGNORE		295
 
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 69a5b605ae3..cbb76519f34 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.26 2013/11/20 17:22:46 deraadt Exp $	*/
+/*	$OpenBSD: parse.c,v 1.27 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -155,14 +155,6 @@ parse_hardware_param(FILE *cfile, struct hardware *hardware)
 		hardware->htype = HTYPE_ETHER;
 		hardware->hlen = 6;
 		break;
-	case TOK_TOKEN_RING:
-		hardware->htype = HTYPE_IEEE802;
-		hardware->hlen = 6;
-		break;
-	case TOK_FDDI:
-		hardware->htype = HTYPE_FDDI;
-		hardware->hlen = 6;
-		break;
 	default:
 		parse_warn("expecting a network hardware type");
 		skip_to_semi(cfile);
diff --git a/usr.sbin/dhcpd/conflex.c b/usr.sbin/dhcpd/conflex.c
index ed0289bca79..b3cf193cf23 100644
--- a/usr.sbin/dhcpd/conflex.c
+++ b/usr.sbin/dhcpd/conflex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conflex.c,v 1.11 2013/06/04 13:00:07 krw Exp $	*/
+/*	$OpenBSD: conflex.c,v 1.12 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Lexical scanner for dhcpd config file... */
 
@@ -324,7 +324,6 @@ static const struct keywords {
 	{ "dynamic-bootp-lease-length",		TOK_DYNAMIC_BOOTP_LEASE_LENGTH },
 	{ "ends",				TOK_ENDS },
 	{ "ethernet",				TOK_ETHERNET },
-	{ "fddi",				TOK_FDDI },
 	{ "filename",				TOK_FILENAME },
 	{ "fixed-address",			TOK_FIXED_ADDR },
 	{ "get-lease-hostnames",		TOK_GET_LEASE_HOSTNAMES },
@@ -347,7 +346,6 @@ static const struct keywords {
 	{ "subnet",				TOK_SUBNET },
 	{ "timeout",				TOK_TIMEOUT },
 	{ "timestamp",				TOK_TIMESTAMP },
-	{ "token-ring",				TOK_TOKEN_RING },
 	{ "uid",				TOK_UID },
 	{ "unknown-clients",			TOK_UNKNOWN_CLIENTS },
 	{ "use-host-decl-names",		TOK_USE_HOST_DECL_NAMES },
diff --git a/usr.sbin/dhcpd/dhcp.h b/usr.sbin/dhcpd/dhcp.h
index ec94a633119..5ee1e5f102a 100644
--- a/usr.sbin/dhcpd/dhcp.h
+++ b/usr.sbin/dhcpd/dhcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcp.h,v 1.8 2013/01/13 18:38:02 krw Exp $	*/
+/*	$OpenBSD: dhcp.h,v 1.9 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Protocol structures... */
 
@@ -81,8 +81,6 @@ struct dhcp_packet {
 
 /* Possible values for hardware type (htype) field... */
 #define HTYPE_ETHER		1	/* Ethernet			*/
-#define HTYPE_IEEE802		6	/* IEEE 802.2 Token Ring...	*/
-#define HTYPE_FDDI		8	/* FDDI...			*/
 #define HTYPE_IPSEC_TUNNEL	31	/* IPsec Tunnel (RFC3456)	*/
 
 /* Magic cookie validating dhcp options field (and bootp vendor
diff --git a/usr.sbin/dhcpd/dhctoken.h b/usr.sbin/dhcpd/dhctoken.h
index 5cb5766e33a..b600ab99bf1 100644
--- a/usr.sbin/dhcpd/dhctoken.h
+++ b/usr.sbin/dhcpd/dhctoken.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhctoken.h,v 1.6 2009/09/01 08:42:31 reyk Exp $	*/
+/*	$OpenBSD: dhctoken.h,v 1.7 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Tokens for config file lexer and parser. */
 
@@ -72,7 +72,6 @@
 #define TOK_DYNAMIC_BOOTP_LEASE_LENGTH	289
 #define TOK_BOOT_UNKNOWN_CLIENTS	290
 #define TOK_NEXT_SERVER			291
-#define TOK_TOKEN_RING			292
 #define TOK_GROUP			293
 #define TOK_GET_LEASE_HOSTNAMES		295
 #define TOK_USE_HOST_DECL_NAMES		296
@@ -87,7 +86,6 @@
 #define TOK_DOMAIN			323
 #define TOK_HOSTNAME			328
 #define TOK_CLIENT_HOSTNAME		329
-#define TOK_FDDI			331
 #define TOK_USE_LEASE_ADDR_FOR_DEFAULT_ROUTE	332
 #define TOK_AUTHORITATIVE		333
 #define TOK_TOKEN_NOT			334
diff --git a/usr.sbin/dhcpd/parse.c b/usr.sbin/dhcpd/parse.c
index 6642df5beff..57f980d813c 100644
--- a/usr.sbin/dhcpd/parse.c
+++ b/usr.sbin/dhcpd/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.15 2013/11/22 04:47:40 deraadt Exp $	*/
+/*	$OpenBSD: parse.c,v 1.16 2013/12/05 22:31:35 krw Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -205,11 +205,6 @@ parse_hardware_param(FILE *cfile, struct hardware *hardware)
 	case TOK_ETHERNET:
 		hardware->htype = HTYPE_ETHER;
 		break;
-	case TOK_TOKEN_RING:
-		hardware->htype = HTYPE_IEEE802;
-		break;
-	case TOK_FDDI:
-		hardware->htype = HTYPE_FDDI;
 		break;
 	case TOK_IPSEC_TUNNEL:
 		hardware->htype = HTYPE_IPSEC_TUNNEL;