diff options
| author | Damien Miller <djm@mindrot.org> | 2003-02-24 11:57:32 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-02-24 11:57:32 +1100 |
| commit | 9f1e33a6b295f46dba45b0eefac173f699480943 (patch) | |
| tree | cb73847e14b5dbca4f932c333d65df040dcf3b6d /ssh.c | |
| parent | 97f39ae810a8589c262f2b88d7dd4e70c0b84d70 (diff) | |
| download | openssh-git-9f1e33a6b295f46dba45b0eefac173f699480943.tar.gz | |
- markus@cvs.openbsd.org 2003/02/06 09:27:29
[ssh.c ssh_config.5]
support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 */ |