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/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch | |
| parent | 633c5137df86e782759e0d88c0facfb2d3f0c424 (diff) | |
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/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch b/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch deleted file mode 100644 index 32a02cd56a..0000000000 --- a/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2c594732eb7391e7cfa817598e33e61cab71131f Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Thu, 3 Jan 2019 13:42:03 +0000 -Subject: [PATCH 22/32] File logic bug in cache-marshalling code. Introduced a - couple of commits back. - -Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> ---- - src/cache.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/src/cache.c -+++ b/src/cache.c -@@ -742,8 +742,7 @@ int cache_recv_insert(time_t now, int fd - else if (flags & F_DS) - { - if (!read_write(fd, (unsigned char *)&class, sizeof(class), 1) || -- (flags & F_NEG) || -- !(addr.key.keydata = blockdata_read(fd, addr.key.keylen))) -+ (!(flags & F_NEG) && !(addr.key.keydata = blockdata_read(fd, addr.key.keylen)))) - return 0; - } - #endif |