diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-10 09:53:51 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-10 09:57:19 +0000 |
commit | 18e02fa20c949e17ff77d821e464a44640ca4c52 (patch) | |
tree | a0eb32c16097721ef67ce161fddc7f4c27df71cb /package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch | |
parent | a6a8fe0be5cd2edb1560bfc3f3094c3d34f2d2b0 (diff) | |
download | upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.tar.gz upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.tar.bz2 upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.zip |
Revert "dnsmasq: follow upstream dnsmasq pre-v2.81"
This reverts commit a6a8fe0be5cd2edb1560bfc3f3094c3d34f2d2b0.
buildbot found an error
option.c: In function 'dhcp_context_free':
option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
free(ctx->template_interface);
revert for the moment
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch b/package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch deleted file mode 100644 index e3178b8dfd..0000000000 --- a/package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a220545c4277cba534be5ef4638b5076fc7d2cf4 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Mon, 22 Oct 2018 18:21:48 +0100 -Subject: [PATCH 02/11] Ensure that AD bit is reset on answers from - --address=/<domain>/<address>. - -Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> ---- - src/rfc1035.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -938,9 +938,9 @@ size_t setup_reply(struct dns_header *he - return 0; - - /* clear authoritative and truncated flags, set QR flag */ -- header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR; -- /* set RA flag */ -- header->hb4 |= HB4_RA; -+ header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC )) | HB3_QR; -+ /* clear AD flag, set RA flag */ -+ header->hb4 = (header->hb4 & ~HB4_AD) | HB4_RA; - - header->nscount = htons(0); - header->arcount = htons(0); |