summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--README.tun8
-rw-r--r--ssh.c4
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e3894ffc5..b477b0e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 - djm@cvs.openbsd.org 2006/03/27 23:15:46 10 - djm@cvs.openbsd.org 2006/03/27 23:15:46
11 [sftp.c] 11 [sftp.c]
12 always use a format string for addargs; spotted by mouring@ 12 always use a format string for addargs; spotted by mouring@
13 - deraadt@cvs.openbsd.org 2006/03/28 00:12:31
14 [README.tun ssh.c]
15 spacing
13 16
1420060326 1720060326
15 - OpenBSD CVS Sync 18 - OpenBSD CVS Sync
@@ -4459,4 +4462,4 @@
4459 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4462 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4460 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4463 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4461 4464
4462$Id: ChangeLog,v 1.4290 2006/03/31 12:10:31 djm Exp $ 4465$Id: ChangeLog,v 1.4291 2006/03/31 12:10:51 djm Exp $
diff --git a/README.tun b/README.tun
index d814f396d..5e1cb074c 100644
--- a/README.tun
+++ b/README.tun
@@ -87,12 +87,12 @@ combination with layer 2 tunneling and Ethernet bridging.
87| Client |------( Internet )-----| access.somewhere.net | 87| Client |------( Internet )-----| access.somewhere.net |
88+--------+ ( ) +----------------------+ 88+--------+ ( ) +----------------------+
89 : 192.168.1.78 | 89 : 192.168.1.78 |
90 :............................. +-------+ 90 :............................. +-------+
91 Forwarded ssh connection : | dmzgw | 91 Forwarded ssh connection : | dmzgw |
92 Layer 2 tunnel : +-------+ 92 Layer 2 tunnel : +-------+
93 : | 93 : |
94 : | 94 : |
95 : +------------+ 95 : +------------+
96 :......| sshgateway | 96 :......| sshgateway |
97 | +------------+ 97 | +------------+
98--- real connection Bridge -> | +----------+ 98--- real connection Bridge -> | +----------+
@@ -104,7 +104,7 @@ combination with layer 2 tunneling and Ethernet bridging.
104 104
105Finally connect to the OpenSSH server to establish the tunnel by using 105Finally connect to the OpenSSH server to establish the tunnel by using
106the following command: 106the following command:
107 107
108 ssh sshgateway 108 ssh sshgateway
109 109
110It is also possible to tell the client to fork into the background after 110It is also possible to tell the client to fork into the background after
@@ -129,4 +129,4 @@ interconnect corporate networks.
129 129
130 Reyk Floeter 130 Reyk Floeter
131 131
132$OpenBSD: README.tun,v 1.3 2005/12/08 18:34:10 reyk Exp $ 132$OpenBSD: README.tun,v 1.4 2006/03/28 00:12:31 deraadt Exp $
diff --git a/ssh.c b/ssh.c
index 00995e5dc..7e0a8ba4b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.273 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.274 2006/03/28 00:12:31 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -688,7 +688,7 @@ main(int ac, char **av)
688 if (options.rhosts_rsa_authentication || 688 if (options.rhosts_rsa_authentication ||
689 options.hostbased_authentication) { 689 options.hostbased_authentication) {
690 sensitive_data.nkeys = 3; 690 sensitive_data.nkeys = 3;
691 sensitive_data.keys = xcalloc(sensitive_data.nkeys, 691 sensitive_data.keys = xcalloc(sensitive_data.nkeys,
692 sizeof(Key)); 692 sizeof(Key));
693 693
694 PRIV_START; 694 PRIV_START;