summaryrefslogtreecommitdiffstats
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 d02ba367..e503acd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20061105
+ - (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@
+
20061101
- (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr
events fatal in Solaris process contract support and tell it to signal
@@ -2578,4 +2584,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4581 2006/10/31 23:28:49 dtucker Exp $
+$Id: ChangeLog,v 1.4582 2006/11/04 18:31:33 djm Exp $
diff --git a/ssh.1 b/ssh.1
index b6f09f40..93be52f9 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.264 2006/09/25 04:55:38 ray Exp $
+.\" $OpenBSD: ssh.1,v 1.265 2006/10/28 18:08:10 otto Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1077,12 +1077,22 @@ controls whether the server supports this,
and at what level (layer 2 or 3 traffic).
.Pp
The following example would connect client network 10.0.50.0/24
-with remote network 10.0.99.0/24, provided that the SSH server
-running on the gateway to the remote network,
-at 192.168.1.15, allows it:
+with remote network 10.0.99.0/24 using a point-to-point connection
+from 10.1.1.1 to 10.1.1.2,
+provided that the SSH server running on the gateway to the remote network,
+at 192.168.1.15, allows it.
+.Pp
+On the client:
.Bd -literal -offset indent
# ssh -f -w 0:1 192.168.1.15 true
-# ifconfig tun0 10.0.50.1 10.0.99.1 netmask 255.255.255.252
+# ifconfig tun0 10.1.1.1 10.1.1.2 netmask 255.255.255.252
+# route add 10.0.99.0/24 10.1.1.2
+.Ed
+.Pp
+On the server:
+.Bd -literal -offset indent
+# ifconfig tun1 10.1.1.2 10.1.1.1 netmask 255.255.255.252
+# route add 10.0.50.0/24 10.1.1.1
.Ed
.Pp
Client access may be more finely tuned via the