[Dnsmasq-discuss] [PATCH] --local was syntactically sugar on top of --server

'Geert Stappers stappers at stappers.nl
Mon May 30 20:28:40 UTC 2022


From: Geert Stappers <stappers at stappers.it>

Manual page was unaware that --local became a separate option.

Now matches the --server and --local section with what
in option.c is:
<screenshot>
$ grep -e '{ "server"' -e '{ "local"' src/option.c
    { "server", 1, 0, 'S' },
    { "local", 1, 0, LOPT_LOCAL },
$
</screenshot>
---
 man/dnsmasq.8 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index 6030e65..890b360 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -443,7 +443,7 @@ Tells dnsmasq to never forward A or AAAA queries for plain names, without dots
 or domain parts, to upstream nameservers. If the name is not known
 from /etc/hosts or DHCP then a "not found" answer is returned.
 .TP
-.B \-S, --local, --server=[/[<domain>]/[domain/]]<ipaddr>[#<port>][@<interface>][@<source-ip>[#<port>]]
+.B \-S, --server=[/[<domain>]/[domain/]]<ipaddr>[#<port>][@<interface>][@<source-ip>[#<port>]]
 Specify IP address of upstream servers directly. Setting this flag does
 not suppress reading of /etc/resolv.conf, use \fB--no-resolv\fP to do that. If one or more
 optional domains are given, that server is used only for those domains
@@ -492,10 +492,6 @@ flag which gives a domain but no IP address; this tells dnsmasq that
 a domain is local and it may answer queries from /etc/hosts or DHCP
 but should never forward queries on that domain to any upstream
 servers.
-.B --local
-is a synonym for
-.B --server
-to make configuration files clearer in this case.
 
 IPv6 addresses may include an %interface scope-id, eg
 fe80::202:a412:4512:7bbf%eth0.
@@ -513,6 +509,12 @@ source address specified but the port may be specified directly as
 part of the source address. Forcing queries to an interface is not
 implemented on all platforms supported by dnsmasq.
 .TP
+.B --local=[/[<domain>]/[domain/]]
+is like
+.B --server
+but the DNS requests are handled locally.
+So no need to provide <ipaddr>[#<port>][@<interface>][@<source-ip>[#<port>]]
+.TP
 .B --rev-server=<ip-address>[/<prefix-len>][,<ipaddr>][#<port>][@<interface>][@<source-ip>[#<port>]]
 This is functionally the same as 
 .B --server, 
-- 
2.36.1




More information about the Dnsmasq-discuss mailing list