[PATCH] Allow "ProxyCommand none" in ssh_config

[Markus Friedl]

If this works and gets tested within 2 hours, then
it could make into 3.5

Index: ssh_config.5
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh_config.5,v
retrieving revision 1.5
diff -u -r1.5 ssh_config.5
--- ssh_config.5	29 Aug 2002 22:54:10 -0000	1.5
+++ ssh_config.5	1 Oct 2002 11:03:56 -0000
@@ -477,6 +477,9 @@
 Note that
 .Cm CheckHostIP
 is not available for connects with a proxy command.
+Set the command to
+.Dq none
+to disable this option entirely.
 .Pp
 .It Cm PubkeyAuthentication
 Specifies whether to try public key authentication.
Index: sshconnect.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.135
diff -u -r1.135 sshconnect.c
--- sshconnect.c	19 Sep 2002 01:58:18 -0000	1.135
+++ sshconnect.c	1 Oct 2002 11:03:56 -0000
@@ -254,7 +254,7 @@
 			port = SSH_DEFAULT_PORT;
 	}
 	/* If a proxy command is given, connect using it. */
-	if (proxy_command != NULL)
+	if (proxy_command != NULL && strcmp(proxy_command, "none") != 0)
 		return ssh_proxy_connect(host, port, proxy_command);
 
 	/* No proxy command. */