summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2022-01-17 16:01:02 +0000
committerSimon Kelley <simon@thekelleys.org.uk>2022-01-17 16:01:02 +0000
commit10cd342f5c847a5e0226d6f0f9ff4ca16db610a5 (patch)
treee2be608813c67b40dd136fd71b81cdc029bd0002
parent27ce754b3d7f2f0c297b0cede6b7ae57b0a0a0a5 (diff)
downloaddnsmasq-10cd342f5c847a5e0226d6f0f9ff4ca16db610a5.tar.gz
Document change of behaviour of --address in 2.86 onwards.
-rw-r--r--CHANGELOG8
-rw-r--r--man/dnsmasq.87
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fc2cf5e..e7a5d4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,14 @@ version 2.87
Thanks to Stefan Rink for the initial patch, which has been
re-worked by me (srk). All bugs mine.
+ Note in manpage the change in behaviour of -address. This behaviour
+ actually changed in v2.86, but was undocumented there. From 2.86 on,
+ (eg) --address=/example.com/1.2.3.4 ONLY applies to A queries. All other
+ types of query will be sent upstream. Pre 2.86, that would catch the
+ whole example.com domain and queries for other types would get
+ a local NODATA answer. The pre-2.86 behaviour is still available,
+ by configuring --address=/example.com/1.2.3.4 --local=/example.com/
+
version 2.86
Handle DHCPREBIND requests in the DHCPv6 server code.
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index 74cda38..0d53474 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -523,7 +523,7 @@ Allowed prefix lengths are 1-32 (IPv4) and 1-128 (IPv6). If the prefix length is
.TP
.B \-A, --address=/<domain>[/<domain>...]/[<ipaddr>]
Specify an IP address to return for any host in the given domains.
-Queries in the domains are never forwarded and always replied to
+A (or AAAA) queries in the domains are never forwarded and always replied to
with the specified IP address which may be IPv4 or IPv6. To give
multiple addresses or both IPv4 and IPv6 addresses for a domain, use repeated \fB--address\fP flags.
Note that /etc/hosts and DHCP leases override this for individual
@@ -543,6 +543,11 @@ address of 0.0.0.0 and its IPv6 equivalent of :: so
its subdomains. This is partly syntactic sugar for \fB--address=/example.com/0.0.0.0\fP
and \fB--address=/example.com/::\fP but is also more efficient than including both
as separate configuration lines. Note that NULL addresses normally work in the same way as localhost, so beware that clients looking up these names are likely to end up talking to themselves.
+
+Note that the behaviour for queries which don't match the specified address literal changed in version 2.86.
+Previous versions, configured with (eg) --address=/example.com/1.2.3.4 and then queried for a RR type other than
+A would return a NoData answer. From 2.86, the query is sent upstream. To restore the pre-2.86 behaviour,
+use the configuration --address=/example.com/1.2.3.4 --local=/example.com/
.TP
.B --ipset=/<domain>[/<domain>...]/<ipset>[,<ipset>...]
Places the resolved IP addresses of queries for one or more domains in