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

Tweak dhcp-config sanity checking.

Browse Source
This commit is contained in:
Simon Kelley
2012-09-24 15:09:33 +01:00
parent db3946c358
commit 35239a302a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dhcp-common.c
View File

@@ -255,7 +255,7 @@ void dhcp_update_configs(struct dhcp_config *configs)
in at most one dhcp-host. Since /etc/hosts can be re-read by SIGHUP, in at most one dhcp-host. Since /etc/hosts can be re-read by SIGHUP,
restore the status-quo ante first. */ restore the status-quo ante first. */
struct dhcp_config *config; struct dhcp_config *config, *conf_tmp;
struct crec *crec; struct crec *crec;
int prot = AF_INET; int prot = AF_INET;
@@ -297,7 +297,8 @@ void dhcp_update_configs(struct dhcp_config *configs)
config->hostname, daemon->addrbuff); config->hostname, daemon->addrbuff);
} }
if (prot == AF_INET && !config_find_by_address(configs, crec->addr.addr.addr.addr4)) if (prot == AF_INET &&
(!(conf_tmp = config_find_by_address(configs, crec->addr.addr.addr.addr4)) || conf_tmp == config))
{ {
config->addr = crec->addr.addr.addr.addr4; config->addr = crec->addr.addr.addr.addr4;
config->flags |= CONFIG_ADDR | CONFIG_ADDR_HOSTS; config->flags |= CONFIG_ADDR | CONFIG_ADDR_HOSTS;
@@ -305,7 +306,8 @@ void dhcp_update_configs(struct dhcp_config *configs)
} }
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
if (prot == AF_INET6 && !config_find_by_address6(configs, &crec->addr.addr.addr.addr6, 128, 0)) if (prot == AF_INET6 &&
(!(conf_tmp = config_find_by_address6(configs, &crec->addr.addr.addr.addr6, 128, 0)) || conf_tmp == config))
{ {
memcpy(&config->addr6, &crec->addr.addr.addr.addr6, IN6ADDRSZ); memcpy(&config->addr6, &crec->addr.addr.addr.addr6, IN6ADDRSZ);
config->flags |= CONFIG_ADDR6 | CONFIG_ADDR_HOSTS; config->flags |= CONFIG_ADDR6 | CONFIG_ADDR_HOSTS;