diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.190 2003/02/06 09:27:29 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -601,6 +601,10 @@ again: | |||
601 | if (options.hostname != NULL) | 601 | if (options.hostname != NULL) |
602 | host = options.hostname; | 602 | host = options.hostname; |
603 | 603 | ||
604 | if (options.proxy_command != NULL && | ||
605 | strcmp(options.proxy_command, "none") == 0) | ||
606 | options.proxy_command = NULL; | ||
607 | |||
604 | /* Disable rhosts authentication if not running as root. */ | 608 | /* Disable rhosts authentication if not running as root. */ |
605 | #ifdef HAVE_CYGWIN | 609 | #ifdef HAVE_CYGWIN |
606 | /* Ignore uid if running under Windows */ | 610 | /* Ignore uid if running under Windows */ |