From: Ben Harris <bjh21@bjh21.me.uk>
Date: Sun, 30 Sep 2007 14:14:29 +0000 (+0000)
Subject: Set cfg.ssh_simple if there are no forwardings.
X-Git-Tag: 0.61~283
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ef370ee6fa3ff670a3146f3ee08f312b12ce414e;p=PuTTY.git

Set cfg.ssh_simple if there are no forwardings.

[originally from svn r7750]
---

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 9d5f0016..9867df2e 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -872,6 +872,14 @@ int main(int argc, char **argv)
     sk_init();
     uxsel_init();
 
+    /*
+     * Unix Plink doesn't provide any way to add forwardings after the
+     * connection is set up, so if there are none now, we can safely set
+     * the "simple" flag.
+     */
+    if (cfg.protocol == PROT_SSH && !cfg.x11_forward &&	!cfg.agentfwd &&
+	cfg.portfwd[0] == '\0' && cfg.portfwd[1] == '\0')
+	cfg.ssh_simple = TRUE;
     /*
      * Start up the connection.
      */