From 19e799611983e3ae5aaffee01bf586678a15883f Mon Sep 17 00:00:00 2001 From: djm Date: Fri, 31 Mar 2006 12:10:51 +0000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2006/03/28 00:12:31 [README.tun ssh.c] spacing --- ChangeLog | 3 +++ README.tun | 8 ++++---- ssh.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ff3ae76..014e9c78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ - djm@cvs.openbsd.org 2006/03/27 23:15:46 [sftp.c] always use a format string for addargs; spotted by mouring@ + - deraadt@cvs.openbsd.org 2006/03/28 00:12:31 + [README.tun ssh.c] + spacing 20060326 - OpenBSD CVS Sync diff --git a/README.tun b/README.tun index d814f396..5e1cb074 100644 --- a/README.tun +++ b/README.tun @@ -87,12 +87,12 @@ combination with layer 2 tunneling and Ethernet bridging. | Client |------( Internet )-----| access.somewhere.net | +--------+ ( ) +----------------------+ : 192.168.1.78 | - :............................. +-------+ + :............................. +-------+ Forwarded ssh connection : | dmzgw | Layer 2 tunnel : +-------+ : | : | - : +------------+ + : +------------+ :......| sshgateway | | +------------+ --- real connection Bridge -> | +----------+ @@ -104,7 +104,7 @@ combination with layer 2 tunneling and Ethernet bridging. Finally connect to the OpenSSH server to establish the tunnel by using the following command: - + ssh sshgateway It is also possible to tell the client to fork into the background after @@ -129,4 +129,4 @@ interconnect corporate networks. Reyk Floeter -$OpenBSD: README.tun,v 1.3 2005/12/08 18:34:10 reyk Exp $ +$OpenBSD: README.tun,v 1.4 2006/03/28 00:12:31 deraadt Exp $ diff --git a/ssh.c b/ssh.c index 00995e5d..7e0a8ba4 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.273 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.274 2006/03/28 00:12:31 deraadt Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -688,7 +688,7 @@ main(int ac, char **av) if (options.rhosts_rsa_authentication || options.hostbased_authentication) { sensitive_data.nkeys = 3; - sensitive_data.keys = xcalloc(sensitive_data.nkeys, + sensitive_data.keys = xcalloc(sensitive_data.nkeys, sizeof(Key)); PRIV_START; -- 2.45.2