extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-03-10 13:08:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix more brokenness.

Browse Source
This commit is contained in:
Brian May 2015-12-06 11:45:49 +11:00
parent aaa6062329
commit 3367124e6b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sshuttle/methods/pf.py
View File

@ -233,7 +233,7 @@ class Method(BaseMethod):
pfctl('-a sshuttle -F all') pfctl('-a sshuttle -F all')
if sys.platform == "darwin": if sys.platform == "darwin":
if _pf_context['Xtoken'] is not None: if _pf_context['Xtoken'] is not None:
pfctl('-X %s' % _pf_context['Xtoken']) pfctl('-X %s' % _pf_context['Xtoken'].decode("ASCII"))
elif _pf_context['started_by_sshuttle']: elif _pf_context['started_by_sshuttle']:
pfctl('-d') pfctl('-d')

2
sshuttle/tests/test_methods_pf.py
View File

@ -176,7 +176,7 @@ def test_setup_firewall(mock_pf_get_dev, mock_ioctl, mock_pfctl):
assert mock_ioctl.mock_calls == [] assert mock_ioctl.mock_calls == []
assert mock_pfctl.mock_calls == [ assert mock_pfctl.mock_calls == [
call('-a sshuttle -F all'), call('-a sshuttle -F all'),
call("-X b'abcdefg'"), call("-X abcdefg"),
] ]
mock_pf_get_dev.reset_mock() mock_pf_get_dev.reset_mock()
mock_pfctl.reset_mock() mock_pfctl.reset_mock()