diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-03-09 08:40:57 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-04 20:44:23 +0000 |
commit | 3251ac8f2d3de29af2a1584f427246ea702fdbd9 (patch) | |
tree | 6c00b1db0a44edb920cb8a1ba33e3538944981b6 /package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch | |
parent | 633c5137df86e782759e0d88c0facfb2d3f0c424 (diff) | |
download | upstream-3251ac8f2d3de29af2a1584f427246ea702fdbd9.tar.gz upstream-3251ac8f2d3de29af2a1584f427246ea702fdbd9.tar.bz2 upstream-3251ac8f2d3de29af2a1584f427246ea702fdbd9.zip |
dnsmasq: bump to v2.81rc1
1st release candidate for v2.81 after 18 months.
Refresh patches & remove all upstreamed leaving:
110-ipset-remove-old-kernel-support.patch
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch b/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch deleted file mode 100644 index 8aa69a743b..0000000000 --- a/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4bf62f616b82fad7a7f91195b0204dd64d79a35c Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Thu, 10 Jan 2019 21:54:22 +0000 -Subject: [PATCH 28/32] Tidy cache_blockdata_free() - -Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> ---- - src/cache.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - ---- a/src/cache.c -+++ b/src/cache.c -@@ -200,14 +200,17 @@ static void cache_hash(struct crec *crec - - static void cache_blockdata_free(struct crec *crecp) - { -- if (crecp->flags & F_SRV && !(crecp->flags & F_NEG)) -- blockdata_free(crecp->addr.srv.target); -+ if (!(crecp->flags & F_NEG)) -+ { -+ if (crecp->flags & F_SRV) -+ blockdata_free(crecp->addr.srv.target); - #ifdef HAVE_DNSSEC -- else if (crecp->flags & F_DNSKEY) -- blockdata_free(crecp->addr.key.keydata); -- else if ((crecp->flags & F_DS) && !(crecp->flags & F_NEG)) -- blockdata_free(crecp->addr.ds.keydata); -+ else if (crecp->flags & F_DNSKEY) -+ blockdata_free(crecp->addr.key.keydata); -+ else if (crecp->flags & F_DS) -+ blockdata_free(crecp->addr.ds.keydata); - #endif -+ } - } - - static void cache_free(struct crec *crecp) |