d8c679
diff -up dhcp-4.2.1b1/client/dhclient.8.man dhcp-4.2.1b1/client/dhclient.8
d8c679
--- dhcp-4.2.1b1/client/dhclient.8.man	2010-07-14 22:09:34.000000000 +0200
d8c679
+++ dhcp-4.2.1b1/client/dhclient.8	2011-01-27 18:19:07.000000000 +0100
d8c679
@@ -115,6 +115,33 @@ dhclient - Dynamic Host Configuration Pr
d8c679
 .B -w
d8c679
 ]
d8c679
 [
d8c679
+.B -B
d8c679
+]
d8c679
+[
d8c679
+.B -I
d8c679
+.I dhcp-client-identifier
d8c679
+]
d8c679
+[
d8c679
+.B -H
d8c679
+.I host-name
d8c679
+]
d8c679
+[
d8c679
+.B -F
d8c679
+.I fqdn.fqdn
d8c679
+]
d8c679
+[
d8c679
+.B -V
d8c679
+.I vendor-class-identifier
d8c679
+]
d8c679
+[
d8c679
+.B -R
d8c679
+.I request-option-list
d8c679
+]
d8c679
+[
d8c679
+.B -timeout
d8c679
+.I timeout
d8c679
+]
d8c679
+[
d8c679
 .B -v
d8c679
 ]
d8c679
 [
d8c679
@@ -264,6 +291,69 @@ not to exit when it doesn't find any suc
d8c679
 program can then be used to notify the client when a network interface
d8c679
 has been added or removed, so that the client can attempt to configure an IP
d8c679
 address on that interface.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-B
d8c679
+Set the BOOTP broadcast flag in request packets so servers will always
d8c679
+broadcast replies.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-I\ <dhcp-client-identifier>
d8c679
+Specify the dhcp-client-identifier option to send to the DHCP server.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-H\ <host-name>
d8c679
+Specify the host-name option to send to the DHCP server.  The host-name
d8c679
+string only contains the client's hostname prefix, to which the server will
d8c679
+append the ddns-domainname or domain-name options, if any, to derive the
d8c679
+fully qualified domain name of the client.  The
d8c679
+.B -H
d8c679
+option cannot be used with the
d8c679
+.B -F
d8c679
+option.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-F\ <fqdn.fqdn>
d8c679
+Specify the fqdn.fqdn option to send to the DHCP server.  This option cannot
d8c679
+be used with the
d8c679
+.B -H
d8c679
+option.  The fqdn.fqdn option must specify the complete domain name of the
d8c679
+client host, which the server may use for dynamic DNS updates.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-V\ <vendor-class-identifier>
d8c679
+Specify the vendor-class-identifier option to send to the DHCP server.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-R\ <option>[,<option>...]
d8c679
+Specify the list of options the client is to request from the server.  The
d8c679
+option list must be a single string consisting of option names separated
d8c679
+by at least one command and optional space characters.  The default option
d8c679
+list is:
d8c679
+
d8c679
+.BR
d8c679
+    subnet-mask, broadcast-address, time-offset, routers,
d8c679
+.BR
d8c679
+    domain-search, domain-name, domain-name-servers, host-name, 
d8c679
+.BR
d8c679
+    nis-domain, nis-servers, ntp-servers, interface-mtu
d8c679
+
d8c679
+.TP
d8c679
+.B -R
d8c679
+option does not append options to the default request, it overrides the
d8c679
+default request list.  Keep this in mind if you want to request an
d8c679
+additional option besides the default request list.  You will have to
d8c679
+specify all option names for the
d8c679
+.B -R
d8c679
+parameter.
d8c679
+
d8c679
+.TP
d8c679
+.BI \-timeout\ <timeout>
d8c679
+Specify the time after which
d8c679
+.B dhclient
d8c679
+will decide that no DHCP servers can be contacted when no responses have been
d8c679
+received.
d8c679
+
d8c679
 .TP
d8c679
 .BI \-n
d8c679
 Do not configure any interfaces.  This is most likely to be useful in
d8c679
diff -up dhcp-4.2.4-P2/client/clparse.c.options dhcp-4.2.4-P2/client/clparse.c
d8c679
--- dhcp-4.2.4-P2/client/clparse.c.options	2012-08-24 21:11:21.000000000 +0200
d8c679
+++ dhcp-4.2.4-P2/client/clparse.c	2012-09-26 10:34:27.140049896 +0200
d5d042
@@ -154,6 +154,7 @@ isc_result_t read_client_conf ()
4bf24c
 	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
4bf24c
 	 */
4bf24c
 	top_level_config.requested_lease = 7200;
4bf24c
+	top_level_config.bootp_broadcast_always = 0;
203b45
 
4bf24c
 	group_allocate (&top_level_config.on_receipt, MDL);
4bf24c
 	if (!top_level_config.on_receipt)
d5d042
@@ -320,7 +321,8 @@ void read_client_leases ()
4bf24c
 	interface-declaration |
4bf24c
 	LEASE client-lease-statement |
4bf24c
 	ALIAS client-lease-statement |
4bf24c
-	KEY key-definition */
4bf24c
+	KEY key-definition |
4bf24c
+	BOOTP_BROADCAST_ALWAYS */
203b45
 
4bf24c
 void parse_client_statement (cfile, ip, config)
4bf24c
 	struct parse *cfile;
d5d042
@@ -739,6 +741,12 @@ void parse_client_statement (cfile, ip,
4bf24c
 		parse_reject_statement (cfile, config);
4bf24c
 		return;
4bf24c
 
4bf24c
+	      case BOOTP_BROADCAST_ALWAYS:
4bf24c
+		token = next_token(&val, (unsigned*)0, cfile);
4bf24c
+		config -> bootp_broadcast_always = 1;
4bf24c
+		parse_semi (cfile);
4bf24c
+		return;
4bf24c
+
4bf24c
 	      default:
4bf24c
 		lose = 0;
4bf24c
 		stmt = (struct executable_statement *)0;
d8c679
diff -up dhcp-4.2.4-P2/client/dhclient.c.options dhcp-4.2.4-P2/client/dhclient.c
d8c679
--- dhcp-4.2.4-P2/client/dhclient.c.options	2012-08-28 04:13:03.000000000 +0200
d8c679
+++ dhcp-4.2.4-P2/client/dhclient.c	2012-09-26 10:36:10.396967531 +0200
5a3797
@@ -39,6 +39,12 @@
82186f
 #include <limits.h>
5a3797
 #include <dns/result.h>
203b45
 
203b45
+/*
203b45
+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
203b45
+ * that when building ISC code.
203b45
+ */
203b45
+extern int asprintf(char **strp, const char *fmt, ...);
203b45
+
203b45
 TIME default_lease_time = 43200; /* 12 hours... */
203b45
 TIME max_lease_time = 86400; /* 24 hours... */
203b45
 
06c72f
@@ -87,6 +93,9 @@ int wanted_ia_na = -1;		/* the absolute
4bf24c
 int wanted_ia_ta = 0;
4bf24c
 int wanted_ia_pd = 0;
82186f
 char *mockup_relay = NULL;
203b45
+int bootp_broadcast_always = 0;
203b45
+
203b45
+extern u_int32_t default_requested_options[];
203b45
 
4bf24c
 void run_stateless(int exit_mode);
203b45
 
bb77af
@@ -123,6 +132,15 @@ main(int argc, char **argv) {
82186f
 	int local_family_set = 0;
4bf24c
 #endif /* DHCPv6 */
203b45
 	char *s;
203b45
+	char *dhcp_client_identifier_arg = NULL;
203b45
+	char *dhcp_host_name_arg = NULL;
203b45
+	char *dhcp_fqdn_arg = NULL;
203b45
+	char *dhcp_vendor_class_identifier_arg = NULL;
203b45
+	char *dhclient_request_options = NULL;
203b45
+
203b45
+	int timeout_arg = 0;
203b45
+	char *arg_conf = NULL;
203b45
+	int arg_conf_len = 0;
203b45
 
82186f
 	/* Initialize client globals. */
82186f
 	memset(&default_duid, 0, sizeof(default_duid));
bb77af
@@ -310,6 +328,88 @@ main(int argc, char **argv) {
4bf24c
 		} else if (!strcmp(argv[i], "--version")) {
4bf24c
 			log_info("isc-dhclient-%s", PACKAGE_VERSION);
4bf24c
 			exit(0);
4bf24c
+		} else if (!strcmp(argv[i], "-I")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
82186f
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
4bf24c
+				log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			dhcp_client_identifier_arg = argv[i];
4bf24c
+		} else if (!strcmp(argv[i], "-B")) {
203b45
+			bootp_broadcast_always = 1;
4bf24c
+		} else if (!strcmp(argv[i], "-H")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
82186f
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
4bf24c
+				log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			if (dhcp_host_name_arg != NULL) {
203b45
+				log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			dhcp_host_name_arg = argv[i];
4bf24c
+		} else if (!strcmp(argv[i], "-F")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
82186f
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
4bf24c
+				log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			if (dhcp_fqdn_arg != NULL) {
203b45
+				log_error("Only one -F <fqdn> argument can be specified");
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			if (dhcp_host_name_arg != NULL) {
203b45
+				log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			dhcp_fqdn_arg = argv[i];
4bf24c
+		} else if (!strcmp(argv[i], "-timeout")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
203b45
+			if ((timeout_arg = atoi(argv[i])) <= 0) {
663dce
+				log_error("timeout option must be > 0 - bad value: %s",argv[i]);
203b45
+				exit(1);
203b45
+			}
4bf24c
+		} else if (!strcmp(argv[i], "-V")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
82186f
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
4bf24c
+				log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
203b45
+				exit(1);
203b45
+			}
203b45
+
203b45
+			dhcp_vendor_class_identifier_arg = argv[i];
4bf24c
+		} else if (!strcmp(argv[i], "-R")) {
203b45
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
4bf24c
+				usage();
4bf24c
+				exit(1);
203b45
+			}
203b45
+
4bf24c
+			dhclient_request_options = argv[i];
4bf24c
 		} else if (argv[i][0] == '-') {
4bf24c
 		    usage();
4bf24c
 		} else if (interfaces_requested < 0) {
663dce
@@ -484,6 +584,156 @@ main(int argc, char **argv) {
203b45
 	/* Parse the dhclient.conf file. */
4bf24c
 	read_client_conf();
203b45
 
203b45
+	/* Parse any extra command line configuration arguments: */
203b45
+	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
203b45
+		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
203b45
+
203b45
+		if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+			log_fatal("Unable to send -I option dhcp-client-identifier");
203b45
+	}
203b45
+
203b45
+	if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
203b45
+		if (arg_conf == 0) {
203b45
+			arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -H option host-name");
203b45
+		} else {
203b45
+			char *last_arg_conf = arg_conf;
203b45
+			arg_conf = NULL;
4bf24c
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -H option host-name");
203b45
+
203b45
+			free(last_arg_conf);
203b45
+		}
203b45
+	}
203b45
+
203b45
+	if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
203b45
+		if (arg_conf == 0) {
203b45
+			arg_conf_len = asprintf(&arg_conf,  "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -F option fqdn.fqdn");
203b45
+		} else {
203b45
+			char *last_arg_conf = arg_conf;
203b45
+			arg_conf = NULL;
4bf24c
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
203b45
+
203b45
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -F option fqdn.fqdn");
203b45
+
203b45
+			free(last_arg_conf);
203b45
+		}
203b45
+	}
203b45
+
203b45
+	if (timeout_arg) {
203b45
+		if (arg_conf == 0) {
203b45
+			arg_conf_len = asprintf(&arg_conf,  "timeout %d;", timeout_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
4bf24c
+				log_fatal("Unable to process -timeout timeout argument");
203b45
+		} else {
203b45
+			char *last_arg_conf = arg_conf;
203b45
+			arg_conf = NULL;
4bf24c
+			arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len == 0))
4bf24c
+				log_fatal("Unable to process -timeout timeout argument");
203b45
+
203b45
+			free(last_arg_conf);
203b45
+		}
203b45
+	}
203b45
+
203b45
+	if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
203b45
+		if (arg_conf == 0) {
203b45
+			arg_conf_len = asprintf(&arg_conf,  "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -V option vendor-class-identifier");
203b45
+		} else {
203b45
+			char *last_arg_conf = arg_conf;
203b45
+			arg_conf = NULL;
203b45
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to send -V option vendor-class-identifier");
203b45
+
203b45
+			free(last_arg_conf);
203b45
+		}
203b45
+	}
203b45
+
203b45
+	if (dhclient_request_options != NULL) {
203b45
+		if (arg_conf == 0) {
203b45
+			arg_conf_len = asprintf(&arg_conf,  "request %s;", dhclient_request_options);
203b45
+
203b45
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to parse -R <request options list> argument");
203b45
+		} else {
203b45
+			char *last_arg_conf = arg_conf;
203b45
+			arg_conf = NULL;
203b45
+			arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
203b45
+
203b45
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
203b45
+				log_fatal("Unable to parse -R <request options list> argument");
203b45
+
203b45
+			free(last_arg_conf);
203b45
+		}
203b45
+	}
203b45
+
203b45
+	if (arg_conf) {
203b45
+		if (arg_conf_len == 0)
203b45
+			if ((arg_conf_len = strlen(arg_conf)) == 0)
203b45
+				/* huh ? cannot happen ! */
4bf24c
+				log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
203b45
+
203b45
+		/* parse the extra dhclient.conf configuration arguments
203b45
+		 * into top level config: */
203b45
+		struct parse *cfile = (struct parse *)0;
203b45
+		const char *val = NULL;
203b45
+		int token;
203b45
+
4bf24c
+		status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
203b45
+
203b45
+		if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
4bf24c
+			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
203b45
+		/* more detailed parse failures will be logged */
203b45
+
203b45
+		do {
4bf24c
+			token = peek_token(&val, (unsigned *)0, cfile);
203b45
+			if (token == END_OF_FILE)
203b45
+				break;
203b45
+
4bf24c
+			parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
203b45
+		} while (1);
203b45
+
203b45
+		if (cfile -> warnings_occurred)
4bf24c
+			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
4bf24c
+		end_parse(&cfile);
203b45
+
203b45
+		if (timeout_arg) {
203b45
+			/* we just set the toplevel timeout, but per-client
663dce
+			 * timeouts may still be at defaults.
203b45
+			 */
4bf24c
+			for (ip=interfaces; ip; ip = ip->next) {
203b45
+				if (ip->client->config->timeout == 60)
203b45
+					ip->client->config->timeout = timeout_arg;
203b45
+			}
203b45
+		}
203b45
+
203b45
+		if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
4bf24c
+			for (ip=interfaces; ip; ip = ip->next) {
203b45
+				if (ip->client->config->requested_options == default_requested_options)
203b45
+					ip->client->config->requested_options = top_level_config.requested_options;
203b45
+			}
203b45
+		}
203b45
+
203b45
+		free(arg_conf);
203b45
+		arg_conf = NULL;
203b45
+		arg_conf_len = 0;
203b45
+	}
203b45
+
203b45
 	/* Parse the lease database. */
4bf24c
 	read_client_leases();
203b45
 
d8c679
@@ -715,6 +965,10 @@ static void usage()
d8c679
 		  "                [-s server-addr] [-cf config-file] "
d8c679
 		  "[-lf lease-file]\n"
d8c679
 		  "                [-pf pid-file] [--no-pid] [-e VAR=val]\n"
d8c679
+		  "                [-I <dhcp-client-identifier>] [-B]\n"
d8c679
+		  "                [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]\n"
d8c679
+		  "                [-V <vendor-class-identifier>]\n"
d8c679
+		  "                [-R <request option list>]\n"
d8c679
 		  "                [-sf script-file] [interface]");
d8c679
 }
d8c679
 
d8c679
@@ -2421,7 +2675,8 @@ void make_discover (client, lease)
203b45
 	client -> packet.xid = random ();
203b45
 	client -> packet.secs = 0; /* filled in by send_discover. */
203b45
 
203b45
-	if (can_receive_unicast_unconfigured (client -> interface))
203b45
+	if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
203b45
+	    && can_receive_unicast_unconfigured(client->interface))
203b45
 		client -> packet.flags = 0;
203b45
 	else
203b45
 		client -> packet.flags = htons (BOOTP_BROADCAST);
d8c679
@@ -2505,7 +2760,9 @@ void make_request (client, lease)
203b45
 	} else {
203b45
 		memset (&client -> packet.ciaddr, 0,
203b45
 			sizeof client -> packet.ciaddr);
203b45
-		if (can_receive_unicast_unconfigured (client -> interface))
203b45
+		if ((!(bootp_broadcast_always ||
203b45
+		    client ->config->bootp_broadcast_always)) &&
203b45
+		    can_receive_unicast_unconfigured (client -> interface))
203b45
 			client -> packet.flags = 0;
203b45
 		else
203b45
 			client -> packet.flags = htons (BOOTP_BROADCAST);
d8c679
@@ -2567,7 +2824,8 @@ void make_decline (client, lease)
203b45
 	client -> packet.hops = 0;
203b45
 	client -> packet.xid = client -> xid;
203b45
 	client -> packet.secs = 0; /* Filled in by send_request. */
203b45
-	if (can_receive_unicast_unconfigured (client -> interface))
203b45
+	if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
203b45
+	    && can_receive_unicast_unconfigured (client->interface))
203b45
 		client -> packet.flags = 0;
203b45
 	else
203b45
 		client -> packet.flags = htons (BOOTP_BROADCAST);
d8c679
diff -up dhcp-4.2.4-P2/common/conflex.c.options dhcp-4.2.4-P2/common/conflex.c
d8c679
--- dhcp-4.2.4-P2/common/conflex.c.options	2012-08-28 04:13:03.000000000 +0200
d8c679
+++ dhcp-4.2.4-P2/common/conflex.c	2012-09-26 10:34:27.142049876 +0200
06c72f
@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
4bf24c
 			return BALANCE;
4bf24c
 		if (!strcasecmp (atom + 1, "ound"))
4bf24c
 			return BOUND;
4bf24c
+		if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
4bf24c
+			return BOOTP_BROADCAST_ALWAYS;
4bf24c
 		break;
4bf24c
 	      case 'c':
9538db
 		if (!strcasecmp(atom + 1, "ase"))
d8c679
diff -up dhcp-4.2.4-P2/includes/dhcpd.h.options dhcp-4.2.4-P2/includes/dhcpd.h
d8c679
--- dhcp-4.2.4-P2/includes/dhcpd.h.options	2012-08-28 04:13:22.000000000 +0200
d8c679
+++ dhcp-4.2.4-P2/includes/dhcpd.h	2012-09-26 10:34:27.143049865 +0200
d8c679
@@ -1153,6 +1153,9 @@ struct client_config {
4bf24c
 	int do_forward_update;		/* If nonzero, and if we have the
4bf24c
 					   information we need, update the
4bf24c
 					   A record for the address we get. */
4bf24c
+
4bf24c
+	int bootp_broadcast_always;	/* If nonzero, always set the BOOTP_BROADCAST
4bf24c
+					   flag in requests */
4bf24c
 };
203b45
 
4bf24c
 /* Per-interface state used in the dhcp client... */
d8c679
diff -up dhcp-4.2.4-P2/includes/dhctoken.h.options dhcp-4.2.4-P2/includes/dhctoken.h
d8c679
--- dhcp-4.2.4-P2/includes/dhctoken.h.options	2012-08-28 04:13:03.000000000 +0200
d8c679
+++ dhcp-4.2.4-P2/includes/dhctoken.h	2012-09-26 10:34:27.144049854 +0200
d5d042
@@ -364,7 +364,8 @@ enum dhcp_token {
06c72f
 	GETHOSTBYNAME = 665,
06c72f
 	PRIMARY6 = 666,
d5d042
 	SECONDARY6 = 667,
d5d042
-	TOKEN_INFINIBAND = 668
d5d042
+	TOKEN_INFINIBAND = 668,
d5d042
+	BOOTP_BROADCAST_ALWAYS = 669
4bf24c
 };
203b45
 
5a3797
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\