diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-30 13:01:24 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-01-30 13:01:24 +0100 |
| commit | e6162b212796838660719be072378818997bb9f3 (patch) | |
| tree | adfaf3a9d720d2cdca838a21bc82585d6c96c3af | |
| parent | d4178c8f478c0e96ff22197b5174869721def831 (diff) | |
| download | upstream-e6162b212796838660719be072378818997bb9f3.tar.gz upstream-e6162b212796838660719be072378818997bb9f3.tar.bz2 upstream-e6162b212796838660719be072378818997bb9f3.zip | |
dnsmasq: backport missing braces fix
Fold upstream fix d2d4990
("Fix missing braces in 8eac67c0a15b673c8d27002c248651b308093e4") into
the already existing static lease fix patch.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/patches/001-Fix-entries-in-etc-hosts-disabling-static-leases.patch | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index f48847b9a3..e89ad19f5c 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.80 -PKG_RELEASE:=1.1 +PKG_RELEASE:=1.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/patches/001-Fix-entries-in-etc-hosts-disabling-static-leases.patch b/package/network/services/dnsmasq/patches/001-Fix-entries-in-etc-hosts-disabling-static-leases.patch index d641e4fbf1..d74227fe7c 100644 --- a/package/network/services/dnsmasq/patches/001-Fix-entries-in-etc-hosts-disabling-static-leases.patch +++ b/package/network/services/dnsmasq/patches/001-Fix-entries-in-etc-hosts-disabling-static-leases.patch @@ -20,9 +20,11 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- a/src/dhcp-common.c +++ b/src/dhcp-common.c -@@ -372,7 +372,11 @@ void dhcp_update_configs(struct dhcp_con +@@ -371,8 +371,14 @@ void dhcp_update_configs(struct dhcp_con + int prot = AF_INET; for (config = configs; config; config = config->next) ++ { if (config->flags & CONFIG_ADDR_HOSTS) - config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR6 | CONFIG_ADDR_HOSTS); + config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR_HOSTS); @@ -30,10 +32,11 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> + if (config->flags & CONFIG_ADDR6_HOSTS) + config->flags &= ~(CONFIG_ADDR6 | CONFIG_ADDR6_HOSTS); +#endif ++ } #ifdef HAVE_DHCP6 again: -@@ -421,7 +425,7 @@ void dhcp_update_configs(struct dhcp_con +@@ -421,7 +427,7 @@ void dhcp_update_configs(struct dhcp_con (!(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); |