diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-02-06 09:27:30 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-02-06 09:27:30 +0000 |
| commit | db2e2210944e9504ed471685d3c376082ed5950f (patch) | |
| tree | 1b38358720166c122c549d4e4ca5d4f4f79d4a25 /usr.bin/ssh/ssh.c | |
| parent | 22d42eb4c21ba7d3405556fa61af71b84c99ee63 (diff) | |
support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index a36a6eb8028..b4a9ab21f04 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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> @@ -586,6 +586,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. */ if (original_effective_uid != 0 || !options.use_privileged_port) { debug("Rhosts Authentication disabled, " |