summaryrefslogtreecommitdiffstats
path: root/ssh_config.5
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-12-13 09:33:19 +0100
committerDamien Miller <djm@mindrot.org>2005-12-13 09:33:19 +0100
commit7b58e800364870d05630514945687d2f26e3c065 (patch)
treef8b436c13a767fcb014125513fe53b6bc0bde9a2 /ssh_config.5
parent - jmc@cvs.openbsd.org 2005/12/08 15:06:29 (diff)
downloadopenssh-7b58e800364870d05630514945687d2f26e3c065.tar.xz
openssh-7b58e800364870d05630514945687d2f26e3c065.zip
- reyk@cvs.openbsd.org 2005/12/08 18:34:11
[auth-options.c includes.h misc.c misc.h readconf.c servconf.c] [serverloop.c ssh.c ssh_config.5 sshd_config.5 configure.ac] two changes to the new ssh tunnel support. this breaks compatibility with the initial commit but is required for a portable approach. - make the tunnel id u_int and platform friendly, use predefined types. - support configuration of layer 2 (ethernet) or layer 3 (point-to-point, default) modes. configuration is done using the Tunnel (yes|point-to-point|ethernet|no) option is ssh_config(5) and restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option in sshd_config(5). ok djm@, man page bits by jmc@
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.510
1 files changed, 7 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 281b4046b..68061182c 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.67 2005/12/08 15:06:29 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.68 2005/12/08 18:34:11 reyk Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -911,9 +911,13 @@ with older servers.
.It Cm Tunnel
Request starting
.Xr tun 4
-device forwarding between the client and the server.
+device forwarding between the client and the server. This option also
+allows requesting layer 2 (ethernet) instead of layer 3
+(point-to-point) tunneling from the server.
The argument must be
-.Dq yes
+.Dq yes ,
+.Dq point-to-point ,
+.Dq ethernet
or
.Dq no .
The default is