diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-06-29 21:37:44 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-06-29 21:37:44 +0000 |
| commit | c5563b60a89478719e7dbf2541f2b867e64b2d24 (patch) | |
| tree | db6a6c486cc7b8276c44f6941c9c3c6acdc795f0 /sbin/dhclient/clparse.c | |
| parent | 4ae9ae8aed4819283291ac0efa7db22b89a65dc9 (diff) | |
Nuke undocumented long-deprecated and/or unsupported lease
fields 'hardware', 'alias', 'media', 'medium', 'ethernet'.
Also remove now-unused parse_ethernet().
Making these parsing failures will smoke out anybody with
leases or conf files from the last century.
Diffstat (limited to 'sbin/dhclient/clparse.c')
| -rw-r--r-- | sbin/dhclient/clparse.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index b061b6cfab4..e8ba5400261 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.113 2017/06/16 14:12:12 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.114 2017/06/29 21:37:43 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -166,8 +166,6 @@ read_client_leases(struct interface_info *ifi) * TOK_SUPERSEDE option-decl | * TOK_APPEND option-decl | * TOK_PREPEND option-decl | - * TOK_MEDIA string-list | - * hardware-declaration | * TOK_REQUEST option-list | * TOK_REQUIRE option-list | * TOK_IGNORE option-list | @@ -179,7 +177,6 @@ read_client_leases(struct interface_info *ifi) * TOK_INITIAL_INTERVAL number | * interface-declaration | * TOK_LEASE client-lease-statement | - * TOK_ALIAS client-lease-statement | * TOK_REJECT reject-statement */ void @@ -215,9 +212,6 @@ parse_client_statement(FILE *cfile, struct interface_info *ifi) if (code != -1) config->default_actions[code] = ACTION_PREPEND; break; - case TOK_HARDWARE: - parse_ethernet(cfile, &ifi->hw_address); - break; case TOK_REQUEST: count = parse_option_list(cfile, optlist, sizeof(optlist)); if (count != -1) { @@ -269,11 +263,6 @@ parse_client_statement(FILE *cfile, struct interface_info *ifi) case TOK_LEASE: parse_client_lease_statement(cfile, 1, ifi); break; - case TOK_ALIAS: - case TOK_MEDIA: - /* Deprecated and ignored. */ - skip_to_semi(cfile); - break; case TOK_REJECT: parse_reject_statement(cfile); break; @@ -585,9 +574,6 @@ parse_client_lease_declaration(FILE *cfile, struct client_lease *lease, if (!parse_ip_addr(cfile, &lease->next_server)) return; break; - case TOK_MEDIUM: - skip_to_semi(cfile); - return; case TOK_FILENAME: lease->filename = parse_string(cfile, NULL); break; |