0002-Fix-DHCP-broken-ness-when-no-ping-AND-dhcp-sequentia.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 0669ee7a69a004ce34fed41e50aa575f8e04427b Mon Sep 17 00:00:00 2001
  2. From: Simon Kelley <[email protected]>
  3. Date: Fri, 4 May 2018 16:46:24 +0100
  4. Subject: [PATCH 02/17] Fix DHCP broken-ness when --no-ping AND
  5. --dhcp-sequential-ip are set.
  6. Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
  7. ---
  8. CHANGELOG | 3 ++-
  9. src/dhcp.c | 2 +-
  10. 2 files changed, 3 insertions(+), 2 deletions(-)
  11. --- a/CHANGELOG
  12. +++ b/CHANGELOG
  13. @@ -14,7 +14,8 @@ version 2.80
  14. when the upstream namesevers do not support DNSSEC, and in this
  15. case no DNSSEC validation at all is occuring.
  16. -
  17. + Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip
  18. + are set. Thanks to Daniel Miess for help with this.
  19. version 2.79
  20. --- a/src/dhcp.c
  21. +++ b/src/dhcp.c
  22. @@ -678,7 +678,7 @@ struct ping_result *do_icmp_ping(time_t
  23. if ((count >= max) || option_bool(OPT_NO_PING) || loopback)
  24. {
  25. /* overloaded, or configured not to check, loopback interface, return "not in use" */
  26. - dummy.hash = 0;
  27. + dummy.hash = hash;
  28. return &dummy;
  29. }
  30. else if (icmp_ping(addr))