From 531a17c151aefd817158946c48aa1eec8dcf7994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Wed, 3 Jan 2018 11:51:09 +0000 Subject: docs: document --ns-hosts --to-ns and update --dns --ns-hosts is available since commit d2ee34d71c0e ("dns: Added --ns-hosts to tunnel only some requests") (released as v0.72), but was never documented. --to-ns is available since commit be559fc78b88 ("Fix case where there is no --dns.") after several bugfixes, released as v0.78.4, but was never documented. --- docs/manpage.rst | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/manpage.rst b/docs/manpage.rst index 41339a9..f0703ca 100644 --- a/docs/manpage.rst +++ b/docs/manpage.rst @@ -94,7 +94,30 @@ Options .. option:: --dns Capture local DNS requests and forward to the remote DNS - server. + server. All queries to any of the local system's DNS + servers (/etc/resolv.conf) will be intercepted and + resolved on the remote side of the tunnel instead, there + using the DNS specified via the :option:`--to-ns=` option, + if specified. + +.. option:: --ns-hosts=server1[,server2[,server3[...]]] + + Capture local DNS requests to the specified server(s) + and forward to the remote DNS server. Contrary to the + :option:`--dns` option, this flag allows to specify the + DNS server(s) the queries to which to intercept, + instead of intercepting all DNS traffic on the local + machine. This can be useful when only certain DNS + requests should be resolved on the remote side of the + tunnel, e.g. in combination with dnsmasq. + +.. option:: --to-ns=server + + The DNS to forward requests to when remote DNS + resolution is enabled. If not given, sshuttle will + simply resolve using the system configured resolver on + the remote side (via /etc/resolv.conf on the remote + side). .. option:: --python -- cgit v1.2.3