Putative fix to crash in IPv4 DHCP, introduced whilst

generalising the DHCP option filter code:
don't match options against context tag  when
context->netid.net == NULL, since there's no tag then.
This commit is contained in:
Simon Kelley
2012-02-15 21:58:33 +00:00
parent 60ac5af682
commit 6caacacf6d
3 changed files with 4 additions and 4 deletions

View File

@@ -2095,7 +2095,8 @@ static void do_options(struct dhcp_context *context,
struct dhcp_netid_list *id_list;
/* filter options based on tags, those we want get DHOPT_TAGOK bit set */
tagif = option_filter(netid, &context->netid, config_opts);
context->netid.next = NULL;
tagif = option_filter(netid, context->netid.net ? &context->netid : NULL, config_opts);
/* logging */
if (option_bool(OPT_LOG_OPTS) && req_options)