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

[originally from svn r9255]
[r9254 == f14953d9e94c176cfc928bb719d6f613da96717e]

diff --git a/Recipe b/Recipe
index 1a34bb86eeb0c1db517ac6082b9a1017013997e5..20ab841eb932a54440abef65bf9f99288139bbfb 100644 (file)
--- a/Recipe
+++ b/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

diff --git a/be_none.c b/be_none.c
index 6ec037ac06753543778b7ea022b480ab531bc539..688b8dafe32d62aba7f5d8b6ee58c2f15a499061 100644 (file)
--- a/be_none.c
+++ b/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>

diff --git a/be_ssh.c b/be_ssh.c
new file mode 100644 (file)
index 0000000..57d241c
--- /dev/null
+++ b/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
+};