diff options
author | Simon Kelley <simon@thekelleys.org.uk> | 2012-09-05 23:29:30 +0100 |
---|---|---|
committer | Simon Kelley <simon@thekelleys.org.uk> | 2012-09-05 23:29:30 +0100 |
commit | 4d0f5b4c44e66eb6c426180186b4619bd2f43046 (patch) | |
tree | b2afd804609e3595c36b6814f898c6502fdddabe | |
parent | 1dedeb87cc8c3588e4ff2cde09ba76a8e774f8b1 (diff) | |
download | dnsmasq-4d0f5b4c44e66eb6c426180186b4619bd2f43046.tar.gz |
Fix BOOTP option processing.v2.64test3
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | src/rfc2131.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -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. diff --git a/src/rfc2131.c b/src/rfc2131.c index 207f450..250b1ab 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -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); } } |