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/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch | |
parent | 2a598bbaa3f75b7051c2453a6ccf706191cf2153 (diff) | |
download | upstream-1e93ef84981f2722138824413a1b197fdab7fb6c.tar.gz upstream-1e93ef84981f2722138824413a1b197fdab7fb6c.tar.bz2 upstream-1e93ef84981f2722138824413a1b197fdab7fb6c.zip |
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/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/package/network/services/dnsmasq/patches/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch b/package/network/services/dnsmasq/patches/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch deleted file mode 100644 index fb2d2d7a4a..0000000000 --- a/package/network/services/dnsmasq/patches/0012-Sane-error-message-when-pcap-file-header-is-wrong.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cc5cc8f1e0b4deaaea4cbefe677989b186c84837 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Sat, 2 Jun 2018 14:45:17 +0100 -Subject: [PATCH 12/17] Sane error message when pcap file header is wrong. - -Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> ---- - src/dump.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/src/dump.c -+++ b/src/dump.c -@@ -64,9 +64,10 @@ void dump_init(void) - die(_("cannot create %s: %s"), daemon->dump_file, EC_FILE); - } - else if ((daemon->dumpfd = open(daemon->dump_file, O_APPEND | O_RDWR)) == -1 || -- !read_write(daemon->dumpfd, (void *)&header, sizeof(header), 1) || -- header.magic_number != 0xa1b2c3d4) -+ !read_write(daemon->dumpfd, (void *)&header, sizeof(header), 1)) - die(_("cannot access %s: %s"), daemon->dump_file, EC_FILE); -+ else if (header.magic_number != 0xa1b2c3d4) -+ die(_("bad header in %s"), daemon->dump_file, EC_FILE); - else - { - /* count existing records */ |