Fix BOOTP option processing.

This commit is contained in:
Simon Kelley committed 2012-09-05 23:29:30 +01:00
1 parent 1dedeb87cc
commit 4d0f5b4c44
2 files changed
+5 -1

No files matched your search

+3
View File
@@ -10,6 +10,9 @@ version 2.64
also a match. This allows multiple addresses for a name in
/etc/hosts with one of them assigned via DHCP.
Fix broken vendor-option processing for BOOTP. Thanks to
Hans-Joachim Baader for the bug report.
version 2.63
Do duplicate dhcp-host address check in --test mode.
+2 -1
View File
@@ -493,8 +493,9 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
lease_set_interface(lease, int_index, now);
clear_packet(mess, end);
match_vendor_opts(NULL, daemon->dhcp_opts); /* clear flags */
do_options(context, mess, end, NULL, hostname, get_domain(mess->yiaddr),
netid, subnet_addr, 0, 0, 0, NULL, 0, now);
netid, subnet_addr, 0, 0, -1, NULL, 0, now);
}
}