Merge r9254 (the PSCP/PSFTP protocol override fix).

git-svn-id: svn://svn.tartarus.org/sgt/putty-branch-0.61@9255 cda61777-01e9-0310-a592-d414129be87e

Author: simon

Recipe

@@ -289,7 +289,7 @@ LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
 # to proxy.c depending on whether we're crypto-avoidant or not.
 BE_ALL   = be_all cproxy
 BE_NOSSH = be_nossh nocproxy
-BE_SSH   = be_none cproxy
+BE_SSH   = be_ssh cproxy
 BE_NONE  = be_none nocproxy
 # More backend sets, with the additional Windows serial-port module.
 W_BE_ALL = be_all_s winser cproxy

be_none.c

@@ -1,6 +1,6 @@
 /*
  * Linking module for programs that do not support selection of backend
- * (such as pscp or pterm).
+ * (such as pterm).
  */
 
 #include <stdio.h>

be_ssh.c

@@ -0,0 +1,16 @@
+/*
+ * Linking module for programs that are restricted to only using SSH
+ * (pscp and psftp). These do not support selection of backend, but
+ * must still have a backends[] array mentioning SSH because
+ * settings.c will want to consult it during session load.
+ */
+
+#include <stdio.h>
+#include "putty.h"
+
+const int be_default_protocol = PROT_SSH;
+
+Backend *backends[] = {
+    &ssh_backend,
+    NULL
+};