extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-22 05:49:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use Xtoken if not set

Browse Source
This commit is contained in:
Brian May 2015-12-05 14:12:57 +11:00
parent ed0a92e714
commit 50a6e87237
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sshuttle/methods/pf.py
View File

@ -24,7 +24,7 @@ def pfctl(args, stdin=None):
return o return o
_pf_context = {'started_by_sshuttle': False, 'Xtoken': ''} _pf_context = {'started_by_sshuttle': False, 'Xtoken': None}
# This are some classes and functions used to support pf in yosemite. # This are some classes and functions used to support pf in yosemite.
@ -227,7 +227,8 @@ class Method(BaseMethod):
else: else:
pfctl('-a sshuttle -F all') pfctl('-a sshuttle -F all')
if sys.platform == "darwin": if sys.platform == "darwin":
pfctl('-X %s' % _pf_context['Xtoken']) if _pf_context['Xtoken'] is not None:
pfctl('-X %s' % _pf_context['Xtoken'])
elif _pf_context['started_by_sshuttle']: elif _pf_context['started_by_sshuttle']:
pfctl('-d') pfctl('-d')