Skip to content

S
sshuttle
Commit be559fc7 authored by Itamar Turner-Trauring's avatar Itamar Turner-Trauring Committed by Brian May
Browse files
Options

Fix case where there is no --dns.

parent d2e97a60
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
sshuttle/client.py
View file @ be559fc7
...@@ -553,6 +553,9 @@ def main(listenip_v6, listenip_v4, ...@@ -553,6 +553,9 @@ def main(listenip_v6, listenip_v4,
nslist += resolvconf_nameservers() nslist += resolvconf_nameservers()
if to_nameserver is not None: if to_nameserver is not None:
to_nameserver = "%s@%s" % tuple(to_nameserver[1:]) 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 = subnets_include + subnets_exclude # we don't care here
subnets_v6 = [i for i in subnets if i[0] == socket.AF_INET6] subnets_v6 = [i for i in subnets if i[0] == socket.AF_INET6]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment