Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dhcp-name-match to function when name supplied in --dhcp-host.

Browse Source
This commit is contained in:
Simon Kelley
2019-10-30 21:04:27 +00:00
parent 55a22b88c2
commit 6ebdc95754
3 changed files with 82 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/rfc2131.c
View File

@@ -740,12 +740,9 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
}
else if (client_hostname)
{
struct dhcp_match_name *m;
size_t nl;
domain = strip_hostname(client_hostname);
if ((nl = strlen(client_hostname)) != 0)
if (strlen(client_hostname) != 0)
{
hostname = client_hostname;
@@ -766,30 +763,36 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
netid = &known_id;
}
}
}
}
for (m = daemon->dhcp_name_match; m; m = m->next)
if (hostname)
{
struct dhcp_match_name *m;
size_t nl = strlen(hostname);
for (m = daemon->dhcp_name_match; m; m = m->next)
{
size_t ml = strlen(m->name);
char save = 0;
if (nl < ml)
continue;
if (nl > ml)
{
size_t ml = strlen(m->name);
char save = 0;
if (nl < ml)
continue;
if (nl > ml)
{
save = client_hostname[ml];
client_hostname[ml] = 0;
}
if (hostname_isequal(client_hostname, m->name) &&
(save == 0 || m->wildcard))
{
m->netid->next = netid;
netid = m->netid;
save = hostname[ml];
hostname[ml] = 0;
}
if (save != 0)
client_hostname[ml] = save;
if (hostname_isequal(hostname, m->name) &&
(save == 0 || m->wildcard))
{
m->netid->next = netid;
netid = m->netid;
}
if (save != 0)
hostname[ml] = save;
}
}