mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
7541d30c9c
f52bb5b fix previous commit
18eac67 Fix entries in /etc/hosts disabling static leases.
f8c77ed Fix removal of DHCP_CLIENT_MAC options from DHCPv6 relay replies.
4bf62f6 Tidy cache_blockdata_free()
9c0d445 Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to actually work.
2896e24 Check for not(DS or DNSKEY) in is_outdated_cname_pointer()
a90f09d Fix crash freeing negative SRV cache entries.
5b99eae Cache SRV records.
2daca52 Fix typo in ra-param man page section.
2c59473 File logic bug in cache-marshalling code. Introduced a couple of commits back.
cc921df Remove nested struct/union in cache records and all_addr.
ab194ed Futher address union tidying.
65a01b7 Tidy address-union handling: move class into explicit argument.
bde4647 Tidy all_addr union, merge log and rcode fields.
e7bfd55 Alter DHCP address selection after DECLINE in consec-addr mode. Avoid offering the same address after a recieving a DECLINE message to stop an infinite protocol loop. This has long been done in default address allocation mode: this adds similar behaviour when allocaing addresses consecutively.
The most relevant fix for openwrt is 18eac67 (& my own local f52bb5b
which fixes a missing bracket silly) To quote the patch:
It is possible for a config entry to have one address family specified by a
dhcp-host directive and the other added from /etc/hosts. This is especially
common on OpenWrt because it uses odhcpd for DHCPv6 and IPv6 leases are
imported into dnsmasq via a hosts file.
To handle this case there need to be separate *_HOSTS flags for IPv4 and IPv6.
Otherwise when the hosts file is reloaded it will clear the CONFIG_ADDR(6) flag
which was set by the dhcp-host directive.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From cf5984367bc6a949e3803a576512c5a7bc48ebab Mon Sep 17 00:00:00 2001
|
|
From: Vladislav Grishenko <themiron@mail.ru>
|
|
Date: Thu, 18 Oct 2018 04:55:21 +0500
|
|
Subject: [PATCH 04/30] Don't forward *.bind/*.server queries upstream
|
|
|
|
Chaos .bind and .server (RFC4892) zones are local, therefore
|
|
don't forward queries upstream to avoid mixing with supported
|
|
locally and false replies with NO_ID enabled.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/rfc1035.c | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
--- a/src/rfc1035.c
|
|
+++ b/src/rfc1035.c
|
|
@@ -1276,7 +1276,7 @@ size_t answer_request(struct dns_header
|
|
int q, ans, anscount = 0, addncount = 0;
|
|
int dryrun = 0;
|
|
struct crec *crecp;
|
|
- int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1;
|
|
+ int nxdomain = 0, notimp = 0, auth = 1, trunc = 0, sec_data = 1;
|
|
struct mx_srv_record *rec;
|
|
size_t len;
|
|
|
|
@@ -1355,6 +1355,17 @@ size_t answer_request(struct dns_header
|
|
}
|
|
}
|
|
|
|
+ if (qclass == C_CHAOS)
|
|
+ {
|
|
+ /* don't forward *.bind and *.server chaos queries */
|
|
+ if (hostname_issubdomain("bind", name) || hostname_issubdomain("server", name))
|
|
+ {
|
|
+ if (!ans)
|
|
+ notimp = 1, auth = 0;
|
|
+ ans = 1;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (qclass == C_IN)
|
|
{
|
|
struct txt_record *t;
|
|
@@ -1903,6 +1914,8 @@ size_t answer_request(struct dns_header
|
|
|
|
if (nxdomain)
|
|
SET_RCODE(header, NXDOMAIN);
|
|
+ else if (notimp)
|
|
+ SET_RCODE(header, NOTIMP);
|
|
else
|
|
SET_RCODE(header, NOERROR); /* no error */
|
|
header->ancount = htons(anscount);
|