summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 11:57:32 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 11:57:32 +1100
commit9f1e33a6b295f46dba45b0eefac173f699480943 (patch)
treecb73847e14b5dbca4f932c333d65df040dcf3b6d
parent97f39ae810a8589c262f2b88d7dd4e70c0b84d70 (diff)
- 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@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c6
-rw-r--r--ssh_config.55
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fc5f241b..9003211e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,9 @@
- markus@cvs.openbsd.org 2003/02/06 09:26:23
[session.c]
missing call to setproctitle() after authentication; ok provos@
+ - 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@
20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1145,4 +1148,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2605 2003/02/24 00:57:01 djm Exp $
+$Id: ChangeLog,v 1.2606 2003/02/24 00:57:32 djm Exp $
diff --git a/ssh.c b/ssh.c
index 7162e680..72060439 100644
--- a/ssh.c
+++ b/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>
@@ -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 */
diff --git a/ssh_config.5 b/ssh_config.5
index ac05a0ce..710c068c 100644
--- a/ssh_config.5
+++ b/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.