summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorItamar Turner-Trauring <itamar@datawire.io>2017-07-14 16:16:50 -0400
committerBrian May <brian@linuxpenguins.xyz>2017-07-18 17:15:03 +1000
commitbe559fc78b881398fb4d0bd79a19d2eb255830a6 (patch)
tree4dd08f2f2395a8baedc29b011b2eb66dd843fb90
parentd2e97a60f78ffc5ec11390934352bc7a52651e8d (diff)
Fix case where there is no --dns.
-rw-r--r--sshuttle/client.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/sshuttle/client.py b/sshuttle/client.py
index 373e320..54022ad 100644
--- a/sshuttle/client.py
+++ b/sshuttle/client.py
@@ -553,6 +553,9 @@ def main(listenip_v6, listenip_v4,
nslist += resolvconf_nameservers()
if to_nameserver is not None:
to_nameserver = "%s@%s" % tuple(to_nameserver[1:])
+ else:
+ # option doesn't make sense if we aren't proxying dns
+ to_nameserver = None
subnets = subnets_include + subnets_exclude # we don't care here
subnets_v6 = [i for i in subnets if i[0] == socket.AF_INET6]