1 files changed, 5 insertions, 1 deletions

diff --git a/ssh.c b/ssh.c
index 7162e680d..720604394 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.190 2003/02/06 09:27:29 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -601,6 +601,10 @@ again:
         if (options.hostname != NULL)
                 host = options.hostname;
 
+        if (options.proxy_command != NULL &&
+            strcmp(options.proxy_command, "none") == 0)
+                options.proxy_command = NULL;
+
         /* Disable rhosts authentication if not running as root. */
 #ifdef HAVE_CYGWIN
         /* Ignore uid if running under Windows */