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 | |
| parent | 22d42eb4c21ba7d3405556fa61af71b84c99ee63 (diff) | |
support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 5 |
2 files changed, 9 insertions, 2 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, " diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index ac05a0ceae7..710c068c5bd 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.5 2002/08/29 22:54:10 stevesk Exp $ +.\" $OpenBSD: ssh_config.5,v 1.6 2003/02/06 09:27:29 markus Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -474,6 +474,9 @@ somewhere. Host key management will be done using the HostName of the host being connected (defaulting to the name typed by the user). +Setting the command to +.Dq none +disables this option entirely. Note that .Cm CheckHostIP is not available for connects with a proxy command. |