0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From b683cf37f9f3dd3dc5d95d621ee75850d559b2e4 Mon Sep 17 00:00:00 2001
  2. From: Kevin Darbyshire-Bryant <[email protected]>
  3. Date: Mon, 10 Dec 2018 10:34:35 +0000
  4. Subject: [PATCH 16/30] build failure on master with NO_DHCPv6 and fix....
  5. Hi Simon,
  6. master has a build error when building without HAVE_DHCPv6
  7. option.c: In function 'dhcp_context_free':
  8. option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
  9. free(ctx->template_interface);
  10. Sadly, need to put in a little conditional compilation ifdef'erey
  11. Simplest patch in the world attached
  12. Cheers,
  13. Kevin D-B
  14. 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A
  15. From 061eb8599636bb360e0b7fa5986935b86db39497 Mon Sep 17 00:00:00 2001
  16. From: Kevin Darbyshire-Bryant <[email protected]>
  17. Date: Mon, 10 Dec 2018 10:07:33 +0000
  18. Subject: [PATCH] option: fix non DHCPv6 build error
  19. option.c: In function 'dhcp_context_free':
  20. option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
  21. free(ctx->template_interface);
  22. ^~
  23. Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
  24. ---
  25. src/option.c | 2 ++
  26. 1 file changed, 2 insertions(+)
  27. --- a/src/option.c
  28. +++ b/src/option.c
  29. @@ -1039,7 +1039,9 @@ static void dhcp_context_free(struct dhc
  30. {
  31. dhcp_netid_free(ctx->filter);
  32. free(ctx->netid.net);
  33. +#ifdef HAVE_DHCP6
  34. free(ctx->template_interface);
  35. +#endif
  36. free(ctx);
  37. }
  38. }