summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian May <brian@linuxpenguins.xyz>2015-12-05 16:41:33 +1100
committerBrian May <brian@linuxpenguins.xyz>2015-12-05 16:41:33 +1100
commit7a9e36d211bdc76c08353774df515ae4ce1c65ac (patch)
tree48986a8d6113c49b461f8fab992aa5df2339a034
parent65e81d51c6968b46bd035dada54213b654a580b8 (diff)
Fix MacOSX/Python3.5 issues.
Closes: #36.
-rw-r--r--sshuttle/methods/pf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshuttle/methods/pf.py b/sshuttle/methods/pf.py
index d913af0..8b68101 100644
--- a/sshuttle/methods/pf.py
+++ b/sshuttle/methods/pf.py
@@ -211,9 +211,9 @@ class Method(BaseMethod):
+ '\n'
pf_status = pfctl('-s all')[0]
- if '\nrdr-anchor "sshuttle" all\n' not in pf_status:
+ if b'\nrdr-anchor "sshuttle" all\n' not in pf_status:
pf_add_anchor_rule(PF_RDR, "sshuttle")
- if '\nanchor "sshuttle" all\n' not in pf_status:
+ if b'\nanchor "sshuttle" all\n' not in pf_status:
pf_add_anchor_rule(PF_PASS, "sshuttle")
pfctl('-a sshuttle -f /dev/stdin', rules)
@@ -221,7 +221,7 @@ class Method(BaseMethod):
o = pfctl('-E')
_pf_context['Xtoken'] = \
re.search(r'Token : (.+)', o[1]).group(1)
- elif 'INFO:\nStatus: Disabled' in pf_status:
+ elif b'INFO:\nStatus: Disabled' in pf_status:
pfctl('-e')
_pf_context['started_by_sshuttle'] = True
else: