tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2006/03/28 00:12:31 

[README.tun ssh.c]
     spacing
This commit is contained in:
Damien Miller 2006-03-31 23:10:51 +11:00
parent 2b5a0de903
commit ddd63ab1d0
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
- djm@cvs.openbsd.org 2006/03/27 23:15:46 - djm@cvs.openbsd.org 2006/03/27 23:15:46
[sftp.c] [sftp.c]
always use a format string for addargs; spotted by mouring@ 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 20060326
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4459,4 +4462,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4290 2006/03/31 12:10:31 djm Exp $ $Id: ChangeLog,v 1.4291 2006/03/31 12:10:51 djm Exp $

8
README.tun
View File

@ -87,12 +87,12 @@ combination with layer 2 tunneling and Ethernet bridging.
| Client |------( Internet )-----| access.somewhere.net | | Client |------( Internet )-----| access.somewhere.net |
+--------+ ( ) +----------------------+ +--------+ ( ) +----------------------+
: 192.168.1.78 | : 192.168.1.78 |
:............................. +-------+ :............................. +-------+
Forwarded ssh connection : | dmzgw | Forwarded ssh connection : | dmzgw |
Layer 2 tunnel : +-------+ Layer 2 tunnel : +-------+
: | : |
: | : |
: +------------+ : +------------+
:......| sshgateway | :......| sshgateway |
| +------------+ | +------------+
--- real connection Bridge -> | +----------+ --- 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 Finally connect to the OpenSSH server to establish the tunnel by using
the following command: the following command:
ssh sshgateway ssh sshgateway
It is also possible to tell the client to fork into the background after It is also possible to tell the client to fork into the background after
@ -129,4 +129,4 @@ interconnect corporate networks.
Reyk Floeter 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 $

4
ssh.c
View File

@ -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 <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -688,7 +688,7 @@ main(int ac, char **av)
if (options.rhosts_rsa_authentication || if (options.rhosts_rsa_authentication ||
options.hostbased_authentication) { options.hostbased_authentication) {
sensitive_data.nkeys = 3; sensitive_data.nkeys = 3;
sensitive_data.keys = xcalloc(sensitive_data.nkeys, sensitive_data.keys = xcalloc(sensitive_data.nkeys,
sizeof(Key)); sizeof(Key));
PRIV_START; PRIV_START;