From 23e0053a419b38bda11bbabe3baba9681d7f8fa1 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 11 Jul 2013 15:15:34 +0200
Subject: BUG 103: Disable proxy command if set to 'none'.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/options.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/options.c b/src/options.c
index 398242be..4fc22dfe 100644
--- a/src/options.c
+++ b/src/options.c
@@ -655,11 +655,15 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
         return -1;
       } else {
         SAFE_FREE(session->ProxyCommand);
-        q = strdup(value);
-        if (q == NULL) {
-            return -1;
+        /* Setting the command to 'none' disables this option. */
+        rc = strcasecmp(value, "none");
+        if (rc != 0) {
+            q = strdup(value);
+            if (q == NULL) {
+                return -1;
+            }
+            session->ProxyCommand = q;
         }
-        session->ProxyCommand = q;
       }
       break;
     default:
-- 
cgit