Skip to content

Commit

Permalink
#2222 we can't wait for tortoisesvn to build a new release of plink w…
Browse files Browse the repository at this point in the history
…ith the security fix, so switch to paramiko by default

git-svn-id: https://xpra.org/svn/Xpra/trunk@22126 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Mar 19, 2019
1 parent a2a8cb1 commit ac9b2f8
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,6 @@ def parse_ssh_string(ssh_setting):
ssh_cmd = ssh_setting
from xpra.platform.features import DEFAULT_SSH_COMMAND
if ssh_setting=="auto":
if DEFAULT_SSH_COMMAND.startswith("plink"):
#prefer plink on win32 if found:
ssh = shlex.split(DEFAULT_SSH_COMMAND)
#find plink.exe?
if which(ssh[0]):
return ssh
#try paramiko:
try:
from xpra.net.ssh import nogssapi_context
Expand Down

0 comments on commit ac9b2f8

Please sign in to comment.