nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

PSFTP was ignoring -1' and -2' and always using SSH-2 with fallback to

Browse Source 
SSH-1. It also ignored any settings forbidding fallback to SSH-1.

Ignoring `-1' and `-2' is hardly the end of the world, as it'd be difficult
to think of a realistic situation where fallback didn't do the right thing
and PSFTP was still useful. However, ignoring a user's `SSH-2 only' setting
was a bit rude.

[originally from svn r4357]
This commit is contained in:
Jacob Nevins 2004-07-25 16:10:48 +00:00
parent c2914f2191
commit 55119c2167
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
psftp.c
View File

@ -1846,6 +1846,15 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
cfg.port = 22;
}
/*
* If saved session / Default Settings says SSH-1 (`1 only' or `1'),
* then change it to SSH-2, on the grounds that that's more likely to
* work for SFTP. (Can be overridden with `-1' option.)
* But if it says `2 only' or `2', respect which.
*/
if (cfg.sshprot != 2 && cfg.sshprot != 3)
cfg.sshprot = 2;
/*
* Enact command-line overrides.
*/
@ -1913,9 +1922,6 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
if (portnumber)
cfg.port = portnumber;
/* SFTP uses SSH2 by default always */
cfg.sshprot = 2;
/*
* Disable scary things which shouldn't be enabled for simple
* things like SCP and SFTP: agent forwarding, port forwarding,