[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

diff --git a/RELNOTES b/RELNOTES
index 421318ace1b2f38f48ed9a613d8dd7b4781ee5f2..4b83814ff31c52a41732b18ce20c30aaa47d0237 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -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 552955c817916755e942a87d45b901ae272e25cd..b87b95350615c75c2e668973bea3474dfb8c2b68 100644 (file)
--- 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);
        }