Update to 4.4.2 and make it work @th-2020.

[packages/dhcp.git] / dhcp-default-requested-options.patch

diff --git a/dhcp-default-requested-options.patch b/dhcp-default-requested-options.patch
index 444258fb6ecf351bb4499aed5630108acf0eae83..f57fa1fbdf6c21fc1ca1c4671aaa231cc30a7cb7 100644 (file)
--- a/dhcp-default-requested-options.patch
+++ b/dhcp-default-requested-options.patch
@@ -1,16 +1,16 @@
-diff -up dhcp-4.0.0/client/clparse.c.dho dhcp-4.0.0/client/clparse.c
---- dhcp-4.0.0/client/clparse.c.dho    2007-12-29 06:32:16.000000000 -1000
-+++ dhcp-4.0.0/client/clparse.c        2007-12-29 06:35:41.000000000 -1000
-@@ -37,7 +37,7 @@
+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 @@
  
  struct client_config top_level_config;
  
 -#define NUM_DEFAULT_REQUESTED_OPTS    9
-+#define NUM_DEFAULT_REQUESTED_OPTS    12
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
++#define NUM_DEFAULT_REQUESTED_OPTS    14
+ /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
  
- static void parse_client_default_duid(struct parse *cfile);
-@@ -107,6 +107,21 @@ isc_result_t read_client_conf ()
+@@ -116,6 +116,31 @@ isc_result_t read_client_conf ()
        option_code_hash_lookup(&default_requested_options[8],
                                dhcpv6_universe.code_hash, &code, 0, MDL);
  
@@ -28,6 +28,16 @@ diff -up dhcp-4.0.0/client/clparse.c.dho dhcp-4.0.0/client/clparse.c
 +      code = DHO_NTP_SERVERS;
 +      option_code_hash_lookup(&default_requested_options[11],
 +                              dhcp_universe.code_hash, &code, 0, MDL);
++
++      /* 13 */
++      code = DHO_INTERFACE_MTU;
++      option_code_hash_lookup(&default_requested_options[12],
++                              dhcp_universe.code_hash, &code, 0, MDL);
++
++      /* 14 */
++      code = DHO_DOMAIN_SEARCH;
++      option_code_hash_lookup(&default_requested_options[13],
++                              dhcp_universe.code_hash, &code, 0, MDL);
 +
        for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
                if (default_requested_options[code] == NULL)