dhcp: Update to 4.3.5b1

[people/arne_f/ipfire-3.x.git] / dhcp / patches / 0008-dhcp-default-requested-options.patch

diff --git a/dhcp/patches/dhcp-4.2.0-default-requested-options.patch b/dhcp/patches/0008-dhcp-default-requested-options.patch
similarity index 76%
rename from dhcp/patches/dhcp-4.2.0-default-requested-options.patch
rename to dhcp/patches/0008-dhcp-default-requested-options.patch
index fea8a4b99c02e55f64353a1e41f28e491054a2d0..f57fa1fbdf6c21fc1ca1c4671aaa231cc30a7cb7 100644 (file)
--- a/dhcp/patches/dhcp-4.2.0-default-requested-options.patch
+++ b/dhcp/patches/0008-dhcp-default-requested-options.patch
@@ -1,16 +1,16 @@
-diff -up dhcp-4.2.0/client/clparse.c.requested dhcp-4.2.0/client/clparse.c
---- dhcp-4.2.0/client/clparse.c.requested      2010-07-21 13:29:05.000000000 +0200
-+++ dhcp-4.2.0/client/clparse.c        2010-07-21 13:50:29.000000000 +0200
-@@ -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    14
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+ /* 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);
-@@ -111,6 +111,31 @@ 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);