]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Use tags from pxe-proxy dhcp-range statements.
authorSimon Kelley <simon@thekelleys.org.uk>
Tue, 20 Aug 2013 09:33:32 +0000 (10:33 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Tue, 20 Aug 2013 09:33:32 +0000 (10:33 +0100)
src/rfc2131.c

index c8e9d5e6b6a8da4fb0af25c5c595ea2e06d55cab..cb1834b3b5dfd631083d3f76f589960a6fe55471 100644 (file)
@@ -848,8 +848,16 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
              
              if (tmp)
                {
-                 struct dhcp_boot *boot = find_boot(tagif_netid);
-               
+                 struct dhcp_boot *boot;
+                 
+                 if (tmp->netid.net)
+                   {
+                     tmp->netid.next = netid;
+                     tagif_netid = run_tag_if(&tmp->netid);
+                   }
+                 
+                 boot = find_boot(tagif_netid);
+                 
                  mess->yiaddr.s_addr = 0;
                  if  (mess_type == DHCPDISCOVER || mess->ciaddr.s_addr == 0)
                    {