From 55119c21670a0ddc604013f4321f3ffde073adff Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sun, 25 Jul 2004 16:10:48 +0000 Subject: [PATCH] PSFTP was ignoring `-1' and `-2' and always using SSH-2 with fallback to 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] --- psftp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/psftp.c b/psftp.c index 218d363c..079a61f3 100644 --- a/psftp.c +++ b/psftp.c @@ -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, -- 2.45.2