diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-13 19:29:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-13 19:29:02 +1100 |
commit | d27b947178df3689bfb7fdfb62a5f1337ef73481 (patch) | |
tree | c8678325c355b3602bdabca16da1baa8707818eb /sshd_config | |
parent | 6dbdb6afeec1820b2799c2693fc8e8b364be8228 (diff) |
- reyk@cvs.openbsd.org 2005/12/06 22:38:28
[auth-options.c auth-options.h channels.c channels.h clientloop.c]
[misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
[serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
[sshconnect.h sshd.8 sshd_config sshd_config.5]
Add support for tun(4) forwarding over OpenSSH, based on an idea and
initial channel code bits by markus@. This is a simple and easy way to
use OpenSSH for ad hoc virtual private network connections, e.g.
administrative tunnels or secure wireless access. It's based on a new
ssh channel and works similar to the existing TCP forwarding support,
except that it depends on the tun(4) network interface on both ends of
the connection for layer 2 or layer 3 tunneling. This diff also adds
support for LocalCommand in the ssh(1) client.
ok djm@, markus@, jmc@ (manpages), tested and discussed with others
Diffstat (limited to 'sshd_config')
-rw-r--r-- | sshd_config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd_config b/sshd_config index 1440c05ff..4957dd1a6 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.72 2005/07/25 11:59:40 markus Exp $ | 1 | # $OpenBSD: sshd_config,v 1.73 2005/12/06 22:38:28 reyk Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
@@ -96,6 +96,7 @@ | |||
96 | #UseDNS yes | 96 | #UseDNS yes |
97 | #PidFile /var/run/sshd.pid | 97 | #PidFile /var/run/sshd.pid |
98 | #MaxStartups 10 | 98 | #MaxStartups 10 |
99 | #PermitTunnel no | ||
99 | 100 | ||
100 | # no default banner path | 101 | # no default banner path |
101 | #Banner /some/path | 102 | #Banner /some/path |