diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-07-28 10:47:32 +0100 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-07-28 11:16:41 +0100 |
| commit | 1e93ef84981f2722138824413a1b197fdab7fb6c (patch) | |
| tree | 1e5df132478e543d3adf2ee0936ffa1221959d00 /package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch | |
| parent | 2a598bbaa3f75b7051c2453a6ccf706191cf2153 (diff) | |
| download | mtk-20170518-1e93ef84981f2722138824413a1b197fdab7fb6c.zip mtk-20170518-1e93ef84981f2722138824413a1b197fdab7fb6c.tar.gz mtk-20170518-1e93ef84981f2722138824413a1b197fdab7fb6c.tar.bz2 | |
dnsmasq: bump to dnsmasq v2.80test3
Refresh patches
Upstream commits since last bump:
3b6eb19 Log DNSSEC trust anchors at startup.
f3e5787 Trivial comment change.
c851c69 Log failure to confirm an address in DHCPv6.
a3bd7e7 Fix missing fatal errors when parsing some command-line/config options.
ab5ceaf Document the --help option in the french manual
1f2f69d Fix recurrent minor spelling mistake in french manual
f361b39 Fix some mistakes in french translation of the manual
eb1fe15 When replacing cache entries, preserve CNAMES which target them.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch b/package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch deleted file mode 100644 index 718cf9d..0000000 --- a/package/network/services/dnsmasq/patches/0008-Fix-logging-in-previous.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e27825b0ef1e79ab05b1752c8c838cb43ad39d79 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Fri, 11 May 2018 17:20:47 +0100 -Subject: [PATCH 08/17] Fix logging in previous. - -Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> ---- - src/forward.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - ---- a/src/forward.c -+++ b/src/forward.c -@@ -835,14 +835,6 @@ void reply_query(int fd, int family, tim - plen = forward->stash_len; - - forward->forwardall = 2; /* only retry once */ -- -- if (forward->sentto->addr.sa.sa_family == AF_INET) -- log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&forward->sentto->addr.in.sin_addr, "dnssec"); --#ifdef HAVE_IPV6 -- else -- log_query(F_NOEXTRA | F_DNSSEC | F_IPV6, "retry", (struct all_addr *)&forward->sentto->addr.in6.sin6_addr, "dnssec"); --#endif -- - start = forward->sentto; - - /* for non-domain specific servers, see if we can find another to try. */ -@@ -886,6 +878,13 @@ void reply_query(int fd, int family, tim - &start->addr.sa, - sa_len(&start->addr)))); - -+ if (start->addr.sa.sa_family == AF_INET) -+ log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&start->addr.in.sin_addr, "dnssec"); -+#ifdef HAVE_IPV6 -+ else -+ log_query(F_NOEXTRA | F_DNSSEC | F_IPV6, "retry", (struct all_addr *)&start->addr.in6.sin6_addr, "dnssec"); -+#endif -+ - return; - } - #endif |