summaryrefslogtreecommitdiffstats
path: root/main.py
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2010-11-09 00:17:01 -0800
committerAvery Pennarun <apenwarr@gmail.com>2010-11-09 00:17:01 -0800
commit32b4defa9b55ba8a214373a408ef6b42c9a58414 (patch)
treea8f7cb6fa034c43f783a94665606c79a946e8fab /main.py
parent8b7605cc5de585dc34296cc7ca42d8602f52c68a (diff)
Add a new --ssh-cmd= option to let you override the ssh command.
Requested by Axel Beckert.
Diffstat (limited to 'main.py')
-rwxr-xr-xmain.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.py b/main.py
index bc0ddd3..eab4e5b 100755
--- a/main.py
+++ b/main.py
@@ -56,6 +56,7 @@ python= specify the name/path of the python interpreter on the remote server [py
r,remote= ssh hostname (and optional username) of remote sshuttle server
x,exclude= exclude this subnet (can be used more than once)
v,verbose increase debug message verbosity
+e,ssh-cmd= the command to use to connect to the remote [ssh]
seed-hosts= with -H, use these hostnames for initial scan (comma-separated)
server (internal use only)
firewall (internal use only)
@@ -97,8 +98,9 @@ try:
else:
sh = None
sys.exit(client.main(parse_ipport(opt.listen or '0.0.0.0:0'),
+ opt.ssh_cmd,
remotename,
- (opt.python or "python"),
+ opt.python,
sh,
opt.auto_nets,
parse_subnets(includes),