commit 1649f709e7351f0c6bbfedc5bd32744b330e2bcd
author Simon Kelley <simon@thekelleys.org.uk> Sun Jun 25 21:19:30 2017 +0100
committer Simon Kelley <simon@thekelleys.org.uk> Sun Jun 25 21:19:30 2017 +0100
tree 96b26214ace5d7888291a6a7f922d07cf8da4b7c
parent 50ca85504c0ece5a15b7300d0a8c1d81113d443c

Fix DHCP relay, broken by ff325644c7afae2588583f935f4ea9b9694eb52e

Thanks to John Fitzgibbon for initial patch.

src/dhcp.c

diff --git a/src/dhcp.c b/src/dhcp.c
index e3509a6..4a2983e 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -273,8 +273,8 @@
   if ((relay = relay_reply4((struct dhcp_packet *)daemon->dhcp_packet.iov_base, ifr.ifr_name)))
     {
       /* Reply from server, using us as relay. */
-      iface_index = relay->iface_index;
-      if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name))
+      rcvd_iface_index = relay->iface_index;
+      if (!indextoname(daemon->dhcpfd, rcvd_iface_index, ifr.ifr_name))
 	return;
       is_relay_reply = 1; 
       iov.iov_len = sz;