mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-14 00:40:12 +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>
121 lines
3.5 KiB
Diff
121 lines
3.5 KiB
Diff
From 6f7812d97bc8f87004c0a5069c6c94c64af78106 Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Tue, 23 Oct 2018 23:54:44 +0100
|
|
Subject: [PATCH 06/30] Fix spurious AD flags in some DNS replies from local
|
|
config.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/rfc1035.c | 42 ++++++++++++++++++++++++------------------
|
|
1 file changed, 24 insertions(+), 18 deletions(-)
|
|
|
|
--- a/src/rfc1035.c
|
|
+++ b/src/rfc1035.c
|
|
@@ -1330,7 +1330,7 @@ size_t answer_request(struct dns_header
|
|
{
|
|
if (t->class == qclass && hostname_isequal(name, t->name))
|
|
{
|
|
- ans = 1;
|
|
+ ans = 1, sec_data = 0;
|
|
if (!dryrun)
|
|
{
|
|
unsigned long ttl = daemon->local_ttl;
|
|
@@ -1370,7 +1370,7 @@ size_t answer_request(struct dns_header
|
|
addr.addr.rcode.rcode = NOTIMP;
|
|
log_query(F_CONFIG | F_RCODE, name, &addr, NULL);
|
|
}
|
|
- ans = 1;
|
|
+ ans = 1, sec_data = 0;
|
|
}
|
|
}
|
|
}
|
|
@@ -1725,7 +1725,7 @@ size_t answer_request(struct dns_header
|
|
}
|
|
else if (is_name_synthetic(flag, name, &addr))
|
|
{
|
|
- ans = 1;
|
|
+ ans = 1, sec_data = 0;
|
|
if (!dryrun)
|
|
{
|
|
log_query(F_FORWARD | F_CONFIG | flag, name, &addr, NULL);
|
|
@@ -1763,25 +1763,27 @@ size_t answer_request(struct dns_header
|
|
for (rec = daemon->mxnames; rec; rec = rec->next)
|
|
if (!rec->issrv && hostname_isequal(name, rec->name))
|
|
{
|
|
- ans = found = 1;
|
|
- if (!dryrun)
|
|
- {
|
|
- int offset;
|
|
- log_query(F_CONFIG | F_RRNAME, name, NULL, "<MX>");
|
|
- if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->local_ttl,
|
|
- &offset, T_MX, C_IN, "sd", rec->weight, rec->target))
|
|
- {
|
|
- anscount++;
|
|
- if (rec->target)
|
|
- rec->offset = offset;
|
|
- }
|
|
- }
|
|
+ ans = found = 1;
|
|
+ sec_data = 0;
|
|
+ if (!dryrun)
|
|
+ {
|
|
+ int offset;
|
|
+ log_query(F_CONFIG | F_RRNAME, name, NULL, "<MX>");
|
|
+ if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->local_ttl,
|
|
+ &offset, T_MX, C_IN, "sd", rec->weight, rec->target))
|
|
+ {
|
|
+ anscount++;
|
|
+ if (rec->target)
|
|
+ rec->offset = offset;
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
if (!found && (option_bool(OPT_SELFMX) || option_bool(OPT_LOCALMX)) &&
|
|
cache_find_by_name(NULL, name, now, F_HOSTS | F_DHCP | F_NO_RR))
|
|
{
|
|
ans = 1;
|
|
+ sec_data = 0;
|
|
if (!dryrun)
|
|
{
|
|
log_query(F_CONFIG | F_RRNAME, name, NULL, "<MX>");
|
|
@@ -1802,6 +1804,7 @@ size_t answer_request(struct dns_header
|
|
if (rec->issrv && hostname_isequal(name, rec->name))
|
|
{
|
|
found = ans = 1;
|
|
+ sec_data = 0;
|
|
if (!dryrun)
|
|
{
|
|
int offset;
|
|
@@ -1838,6 +1841,7 @@ size_t answer_request(struct dns_header
|
|
if (!found && option_bool(OPT_FILTER) && (qtype == T_SRV || (qtype == T_ANY && strchr(name, '_'))))
|
|
{
|
|
ans = 1;
|
|
+ sec_data = 0;
|
|
if (!dryrun)
|
|
log_query(F_CONFIG | F_NEG, name, NULL, NULL);
|
|
}
|
|
@@ -1850,6 +1854,7 @@ size_t answer_request(struct dns_header
|
|
if (hostname_isequal(name, na->name))
|
|
{
|
|
ans = 1;
|
|
+ sec_data = 0;
|
|
if (!dryrun)
|
|
{
|
|
log_query(F_CONFIG | F_RRNAME, name, NULL, "<NAPTR>");
|
|
@@ -1862,11 +1867,12 @@ size_t answer_request(struct dns_header
|
|
}
|
|
|
|
if (qtype == T_MAILB)
|
|
- ans = 1, nxdomain = 1;
|
|
+ ans = 1, nxdomain = 1, sec_data = 0;
|
|
|
|
if (qtype == T_SOA && option_bool(OPT_FILTER))
|
|
{
|
|
- ans = 1;
|
|
+ ans = 1;
|
|
+ sec_data = 0;
|
|
if (!dryrun)
|
|
log_query(F_CONFIG | F_NEG, name, &addr, NULL);
|
|
}
|