2016-05-02 13:17:32 +00:00
|
|
|
diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c
|
|
|
|
--- dhcp-4.3.4/client/clparse.c.requested 2016-04-29 12:18:50.157151352 +0200
|
|
|
|
+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:19:22.235137243 +0200
|
|
|
|
@@ -31,7 +31,7 @@
|
2008-01-13 21:02:47 +00:00
|
|
|
|
|
|
|
struct client_config top_level_config;
|
|
|
|
|
|
|
|
-#define NUM_DEFAULT_REQUESTED_OPTS 9
|
2010-04-28 14:05:21 +00:00
|
|
|
+#define NUM_DEFAULT_REQUESTED_OPTS 14
|
2016-05-02 13:17:32 +00:00
|
|
|
/* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
|
|
|
|
struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
|
2008-01-13 21:02:47 +00:00
|
|
|
|
2016-05-02 13:17:32 +00:00
|
|
|
@@ -116,6 +116,31 @@ isc_result_t read_client_conf ()
|
2008-01-13 21:02:47 +00:00
|
|
|
option_code_hash_lookup(&default_requested_options[8],
|
|
|
|
dhcpv6_universe.code_hash, &code, 0, MDL);
|
|
|
|
|
|
|
|
+ /* 10 */
|
|
|
|
+ code = DHO_NIS_DOMAIN;
|
|
|
|
+ option_code_hash_lookup(&default_requested_options[9],
|
|
|
|
+ dhcp_universe.code_hash, &code, 0, MDL);
|
|
|
|
+
|
|
|
|
+ /* 11 */
|
|
|
|
+ code = DHO_NIS_SERVERS;
|
|
|
|
+ option_code_hash_lookup(&default_requested_options[10],
|
|
|
|
+ dhcp_universe.code_hash, &code, 0, MDL);
|
|
|
|
+
|
|
|
|
+ /* 12 */
|
|
|
|
+ code = DHO_NTP_SERVERS;
|
|
|
|
+ option_code_hash_lookup(&default_requested_options[11],
|
|
|
|
+ dhcp_universe.code_hash, &code, 0, MDL);
|
2010-02-22 16:11:24 +00:00
|
|
|
+
|
|
|
|
+ /* 13 */
|
|
|
|
+ code = DHO_INTERFACE_MTU;
|
|
|
|
+ option_code_hash_lookup(&default_requested_options[12],
|
|
|
|
+ dhcp_universe.code_hash, &code, 0, MDL);
|
2010-04-28 14:05:21 +00:00
|
|
|
+
|
|
|
|
+ /* 14 */
|
|
|
|
+ code = DHO_DOMAIN_SEARCH;
|
|
|
|
+ option_code_hash_lookup(&default_requested_options[13],
|
|
|
|
+ dhcp_universe.code_hash, &code, 0, MDL);
|
2008-01-13 21:02:47 +00:00
|
|
|
+
|
|
|
|
for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
|
|
|
|
if (default_requested_options[code] == NULL)
|
|
|
|
log_fatal("Unable to find option definition for "
|