Skip to content

S
sshuttle
Commit 2bb92cd6 authored by Ivan Shvedunov's avatar Ivan Shvedunov Committed by Brian May
Browse files
Options

Fix sudo/doas 

Fixes #227
parent ae5bd28d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
sshuttle/client.py
View file @ 2bb92cd6
...@@ -198,10 +198,11 @@ class FirewallClient: ...@@ -198,10 +198,11 @@ class FirewallClient:
['--firewall']) ['--firewall'])
if ssyslog._p: if ssyslog._p:
argvbase += ['--syslog'] argvbase += ['--syslog']
argv_tries = [ elev_prefix = [part % {'eb': elevbin, 'pp': python_path}
['%(eb)s', '-p', '[local %(eb)s] Password: ', '/usr/bin/env', for part in ['%(eb)s', '-p',
('PYTHONPATH=%(pp)s' % {'eb': elevbin, 'pp': python_path})] + '[local %(eb)s] Password: ',
argvbase, argvbase] '/usr/bin/env', 'PYTHONPATH=%(pp)s']]
argv_tries = [elev_prefix + argvbase, argvbase]
# we can't use stdin/stdout=subprocess.PIPE here, as we normally would, # we can't use stdin/stdout=subprocess.PIPE here, as we normally would,
# because stupid Linux 'su' requires that stdin be attached to a tty. # because stupid Linux 'su' requires that stdin be attached to a tty.
......
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