diff options
author | Shawn Routhier <sar@isc.org> | 2014-12-10 12:16:56 -0800 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2014-12-10 12:16:56 -0800 |
commit | dd9738aaaf76c6270891cde41140a5928eb02168 (patch) | |
tree | b8a1dbdba8c8ac173299df0dd252f8cf4da37b65 | |
parent | 2775bd6212daf007f622592521cb938247c33b8d (diff) | |
download | isc-dhcp-dd9738aaaf76c6270891cde41140a5928eb02168.tar.gz |
[master] Fix up code to process host declartions in informs
Change the stopping point for processing statements in the
host portion of the inform processing from a host option to
a subnet one.
rt35712
-rw-r--r-- | RELNOTES | 8 | ||||
-rw-r--r-- | server/dhcp.c | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -188,6 +188,14 @@ by Eric Young (eay@cryptsoft.com). whether or not the server is compiled for failover. [ISC-Bugs #36960] +- Fixed a small issue in the treatment of hosts in the inform processing + that could cause the response to an inform to include information from + the wrong scope. The two examples we've heard of are getting subnet + instead of group information associated with a host entry, or getting + global information instead of subnet if the host entry was built via + omapi. + [ISC-Bugs #35712] + Changes since 4.3.1b1 - Modify the linux and openwrt dhclient scripts to process information diff --git a/server/dhcp.c b/server/dhcp.c index 552955c8..b87b9535 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -1305,8 +1305,7 @@ void dhcpinform (packet, ms_nulltp) execute_statements_in_scope(NULL, packet, NULL, NULL, packet->options, options, &global_scope, host->group, - host->group ? - host->group->next : NULL, + subnet->group, NULL); host_dereference (&host, MDL); } |