Nuke unused field bootp_policy and associated enum{}.

diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 69afbe4..fdfa743 100644 (file)
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clparse.c,v 1.110 2017/04/08 20:16:04 krw Exp $       */
+/*     $OpenBSD: clparse.c,v 1.111 2017/06/10 18:03:50 krw Exp $       */
 
 /* Parser for dhclient config and lease files. */
 
@@ -94,7 +94,6 @@ read_client_conf(struct interface_info *ifi)
        config->backoff_cutoff = 10;    /* max secs between packet retries */
        config->initial_interval = 1;   /* secs before 1st retry */
 
-       config->bootp_policy = ACCEPT;
        config->requested_options
            [config->requested_option_count++] = DHO_SUBNET_MASK;
        config->requested_options

diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 3c4804e..0381f93 100644 (file)
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dhcpd.h,v 1.172 2017/06/10 17:56:29 krw Exp $ */
+/*     $OpenBSD: dhcpd.h,v 1.173 2017/06/10 18:03:50 krw Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -114,8 +114,6 @@ struct client_config {
        time_t                   select_interval;
        time_t                   reboot_timeout;
        time_t                   backoff_cutoff;
-       enum { IGNORE, ACCEPT, PREFER }
-                                bootp_policy;
        TAILQ_HEAD(, reject_elem) reject_list;
        char                    *resolv_tail;
        char                    *filename;