summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-11-05 05:31:33 +1100
committerDamien Miller <djm@mindrot.org>2006-11-05 05:31:33 +1100
commit3975ee2c3ce78af4f62ff8e9e5b636ef378b7f6b (patch)
tree049192324c6862160270b7ac8bc3589eb9456e7a
parent4d13ecea54da655dd87152752f332f25785a1e18 (diff)
- (djm) OpenBSD CVS Sync
- otto@cvs.openbsd.org 2006/10/28 18:08:10 [ssh.1] correct/expand example of usage of -w; ok jmc@ stevesk@
-rw-r--r--ChangeLog8
-rw-r--r--ssh.120
2 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d02ba367e..e503acd44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120061105
2 - (djm) OpenBSD CVS Sync
3 - otto@cvs.openbsd.org 2006/10/28 18:08:10
4 [ssh.1]
5 correct/expand example of usage of -w; ok jmc@ stevesk@
6
120061101 720061101
2 - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr 8 - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr
3 events fatal in Solaris process contract support and tell it to signal 9 events fatal in Solaris process contract support and tell it to signal
@@ -2578,4 +2584,4 @@
2578 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2584 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2579 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2585 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2580 2586
2581$Id: ChangeLog,v 1.4581 2006/10/31 23:28:49 dtucker Exp $ 2587$Id: ChangeLog,v 1.4582 2006/11/04 18:31:33 djm Exp $
diff --git a/ssh.1 b/ssh.1
index b6f09f400..93be52f96 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.264 2006/09/25 04:55:38 ray Exp $ 37.\" $OpenBSD: ssh.1,v 1.265 2006/10/28 18:08:10 otto Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1077,12 +1077,22 @@ controls whether the server supports this,
1077and at what level (layer 2 or 3 traffic). 1077and at what level (layer 2 or 3 traffic).
1078.Pp 1078.Pp
1079The following example would connect client network 10.0.50.0/24 1079The following example would connect client network 10.0.50.0/24
1080with remote network 10.0.99.0/24, provided that the SSH server 1080with remote network 10.0.99.0/24 using a point-to-point connection
1081running on the gateway to the remote network, 1081from 10.1.1.1 to 10.1.1.2,
1082at 192.168.1.15, allows it: 1082provided that the SSH server running on the gateway to the remote network,
1083at 192.168.1.15, allows it.
1084.Pp
1085On the client:
1083.Bd -literal -offset indent 1086.Bd -literal -offset indent
1084# ssh -f -w 0:1 192.168.1.15 true 1087# ssh -f -w 0:1 192.168.1.15 true
1085# ifconfig tun0 10.0.50.1 10.0.99.1 netmask 255.255.255.252 1088# ifconfig tun0 10.1.1.1 10.1.1.2 netmask 255.255.255.252
1089# route add 10.0.99.0/24 10.1.1.2
1090.Ed
1091.Pp
1092On the server:
1093.Bd -literal -offset indent
1094# ifconfig tun1 10.1.1.2 10.1.1.1 netmask 255.255.255.252
1095# route add 10.0.50.0/24 10.1.1.1
1086.Ed 1096.Ed
1087.Pp 1097.Pp
1088Client access may be more finely tuned via the 1098Client access may be more finely tuned via the